Merge branch 'develop'

kustomization/overlays/dev/kustomization.yaml

@@ -17,4 +17,4 @@ patches:
 images:
 - name: REGISTRY/NAMESPACE/IMAGE:TAG
   newName: mmc-registry.cn-shenzhen.cr.aliyuncs.com/sharefly-dev/ims
-  newTag: 0e8a8273ccb4d9f5fd5c16144ceddc7c79ca5f85
+  newTag: 6c19d92079fcbe875800f7f1c8fad6f0cbf0a4f3

release-service/src/main/java/com/mmc/csf/release/controller/DynamicController.java

@@ -62,7 +62,7 @@ public class DynamicController {
     @ApiResponses({@ApiResponse(code = 200, message = "OK", response = DynamicVO.class)})
     @GetMapping("/dynamicDetails")
     public ResultBody dynamicDetails(@RequestParam Integer dynamicId,@RequestParam Integer userId) {
-        return ResultBody.success(dynamicService.dynamicDetails(dynamicId,userId));
+        return dynamicService.dynamicDetails(dynamicId,userId);
     }
 
     @ApiOperation(value = "动态列表")

release-service/src/main/java/com/mmc/csf/release/service/impl/RequirementsServiceImpl.java

@@ -48,7 +48,7 @@ public class RequirementsServiceImpl implements RequirementsService {
     @Override
     public ResultBody publish(RequirementsInfoVO requirementsInfoVO) {
         //是否完成认证
-        UserAccountSimpleDTO userAccountSimpleDTO = restTemplateUtil.feignGetUserSimpleInfo(requirementsInfoVO.getUserAccountId());
+        UserAccountSimpleDTO userAccountSimpleDTO = userAppApi.feignGetUserSimpleInfo(requirementsInfoVO.getUserAccountId());
         if (userAccountSimpleDTO == null || !userAccountSimpleDTO.getCompanyAuthStatus().toString().equals("1")){
             return ResultBody.error(ResultEnum.COMPANY_NOT_VERIFY_ERROR);
         }