Merge branch 'develop'

.gitlab-ci.yml

@@ -16,7 +16,7 @@ variables:
   ACR_EE_TAG: $CI_COMMIT_SHA
 
   JAVA_VERSION: '8'
-  GITLAB_URL: https://oauth2:MjVJKxB7m4tCy7symBzn@git.mmcuav.cn/iuav/pms.git
+  GITLAB_URL: https://oauth2:ZhN6PrYzu9ELfyVq_KE5@git.mmcuav.cn/iuav/pms.git
 
 mvn_clean:
   stage: clean

kustomization/overlays/dev/kustomization.yaml

@@ -18,4 +18,4 @@ patches:
 images:
 - name: REGISTRY/NAMESPACE/IMAGE:TAG
   newName: mmc-registry.cn-shenzhen.cr.aliyuncs.com/sharefly-dev/pms
-  newTag: a9bfdfcaf347c83aca6b0d3adba953e1913aaec0
+  newTag: b7fe2c5728b606167daee21c67c452fea7aca1f8

src/main/java/com/mmc/pms/controller/BaseController.java

@@ -52,6 +52,11 @@ public abstract class BaseController {
     if (StringUtils.isBlank(json)) {
       throw new BizException(ResultEnum.LOGIN_ACCOUNT_STATUS_ERROR);
     }
+// 版本问题，需要修改json字符串，去除最外侧""和转义\
+    if (json.startsWith("\"") && json.endsWith("\"")) {
+      json = json.substring(1, json.length() - 1);
+    }
+    json = json.replace("\\","");
     LoginSuccessDTO loginSuccessDTO = JSONObject.parseObject(json, LoginSuccessDTO.class);
     return loginSuccessDTO;
   }

src/main/java/com/mmc/pms/controller/inspection/IndustryTypeController.java

@@ -65,7 +65,7 @@ public class IndustryTypeController {
     @ApiOperation(value = "一级行业详情-全部")
     @ApiResponses({@ApiResponse(code = 200, message = "OK", response = IndustryTypeDTO.class)})
     @GetMapping("getIndustryTypeById")
-    public IndustryTypeDTO getIndustryTypeById(@RequestParam Integer id, @RequestParam Integer inspectionId) {
+    public IndustryTypeDTO getIndustryTypeById(@RequestParam Integer id, @RequestParam(required = false)  Integer inspectionId) {
         return industryTypeService.getIndustryTypeById(id, inspectionId);
     }
 

src/main/resources/not-check.yml

@@ -42,3 +42,4 @@ data-filter:
     - /pms/brand/listBrandInfo
     - /pms/app/lease/leaseGoodsList
     - /pms/lease/goods/getLeaseTermInfo
+    - /pms/app/goods/brandStoreList