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

mall-server-api/src/main/java/com/gree/mall/manager/logic/workorder/OrderBaseExcelLogic.java

@@ -801,6 +801,7 @@ public class OrderBaseExcelLogic {
         }
     }
 
+    @Transactional(rollbackFor = Exception.class)
     public void import3(List<Object> rows) {
 
         AdminUserCom adminUser = commonLogic.getAdminUser();