Merge remote-tracking branch 'origin/dev' into dev

sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/service/impl/PurchaseMacodeInfoServiceImpl.java

@@ -76,7 +76,7 @@ public class PurchaseMacodeInfoServiceImpl implements IPurchaseMacodeInfoService
      * @return 结果
      */
     @Override
-    @Transactional
+    @Transactional(rollbackFor=Exception.class)
     public AjaxResult insertPurchaseMacodeInfo(List<PurchaseMacodeInfo> purchaseMacodeInfoList) throws Exception {
         boolean b = true;
         for (PurchaseMacodeInfo purchaseMacodeInfo : purchaseMacodeInfoList) {

sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/service/impl/RepairAuditDetailsServiceImpl.java

@@ -152,7 +152,7 @@ public class RepairAuditDetailsServiceImpl implements IRepairAuditDetailsService
      * @return 结果
      */
     @Override
-    @Transactional
+    @Transactional(rollbackFor=Exception.class)
     public int auditRepair(ScrapAudit scrapAudit) throws Exception {
         String checkResult = scrapAudit.getCheckResult();
         List<Long> taskIdList = scrapAudit.getTaskIdList();