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

gic-store-api/src/main/java/com/gic/store/dto/StoreFieldRegionRelDTO.java

@@ -31,7 +31,7 @@ public class StoreFieldRegionRelDTO implements Serializable{
     /**
      *
      */
-    private Integer status;
+    private Integer deleteFlag;
 
     /**
      *
@@ -67,12 +67,12 @@ public class StoreFieldRegionRelDTO implements Serializable{
         this.storeFieldId = storeFieldId;
     }
 
-    public Integer getStatus() {
-        return status;
+    public Integer getDeleteFlag() {
+        return deleteFlag;
     }
 
-    public void setStatus(Integer status) {
-        this.status = status;
+    public void setDeleteFlag(Integer deleteFlag) {
+        this.deleteFlag = deleteFlag;
     }
 
     public Date getCreateTime() {
@@ -97,7 +97,7 @@ public class StoreFieldRegionRelDTO implements Serializable{
                 "fieldRegionId=" + fieldRegionId +
                 ", regionId=" + regionId +
                 ", storeFieldId=" + storeFieldId +
-                ", status=" + status +
+                ", status=" + deleteFlag +
                 ", createTime=" + createTime +
                 ", updateTime=" + updateTime +
                 '}';

gic-store-service/src/main/java/com/gic/store/service/outer/impl/StoreFieldApiServiceImpl.java

@@ -102,7 +102,7 @@ public class StoreFieldApiServiceImpl implements StoreFieldApiService {
             StoreFieldRegionRelDTO fieldRegionRelDTO = new StoreFieldRegionRelDTO();
             fieldRegionRelDTO.setCreateTime(now);
             fieldRegionRelDTO.setUpdateTime(now);
-            fieldRegionRelDTO.setStatus(1);
+            fieldRegionRelDTO.setDeleteFlag(0);
             fieldRegionRelDTO.setRegionId(Integer.parseInt(regionId));
             fieldRegionRelDTO.setStoreFieldId(storeFieldId);
             regionRelDTOList.add(fieldRegionRelDTO);
@@ -269,7 +269,7 @@ public class StoreFieldApiServiceImpl implements StoreFieldApiService {
             StoreFieldRegionRelDTO fieldRegionRelDTO = new StoreFieldRegionRelDTO();
             fieldRegionRelDTO.setCreateTime(now);
             fieldRegionRelDTO.setUpdateTime(now);
-            fieldRegionRelDTO.setStatus(1);
+            fieldRegionRelDTO.setDeleteFlag(0);
             fieldRegionRelDTO.setRegionId(Integer.parseInt(regionId));
             fieldRegionRelDTO.setStoreFieldId(storeFieldDTO.getStoreFieldId());
             regionRelDTOList.add(fieldRegionRelDTO);

gic-store-web/src/main/java/com/gic/store/web/controller/ClerkImportController.java

@@ -103,6 +103,7 @@ public class ClerkImportController {
      * @throws IOException
      */
     @RequestMapping("/clerk-tmp-file-upload")
+    @HeaderSignIgnore
     public RestResponse fileUpload(HttpServletRequest request, MultipartFile file, PageQO pageQO) throws IOException {
         Integer enterpriseId = UserDetailUtils.getUserDetail().getEnterpriseId();
         if (file == null || file.isEmpty()) {

gic-store-web/src/main/java/com/gic/store/web/controller/StoreImportController.java

@@ -116,6 +116,7 @@ public class StoreImportController {
      * @throws IOException
      */
     @RequestMapping("/store-tmp-file-upload")
+    @HeaderSignIgnore
     public RestResponse fileUpload(HttpServletRequest request, MultipartFile file, PageQO pageQO) throws IOException {
         Integer enterpriseId = UserDetailUtils.getUserDetail().getEnterpriseId();
         if (file == null || file.isEmpty()) {