Merge branch 'develop'

csf-common/csf-common-model/src/main/java/com/mmc/csf/release/forum/vo/ForumReviewVO.java

@@ -54,6 +54,4 @@ public class ForumReviewVO implements Serializable {
     @ApiModelProperty(value = "用户信息")
     private UserAccountVO userAccountVO;
 
-
-
 }

csf-common/csf-common-model/src/main/java/com/mmc/csf/release/forum/vo/UserBaseInfoVO.java

@@ -33,4 +33,7 @@ public class UserBaseInfoVO implements Serializable {
 
   @ApiModelProperty(value = "地区")
   private String region;
+
+  @ApiModelProperty(value = "是否是飞手")
+  private Integer isPilot;
 }

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/ims
-  newTag: 58017101155be76561a40b3214c17bb51dd3fb8b
+  newTag: 3de1751c306c55dad5a29bc671cfc8a86aeea599

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

@@ -504,6 +504,7 @@ public class DynamicServiceImpl implements DynamicService {
                                                         userBaseInfoVO.setUserName(userAccountSimpleDTO.getUserName());
                                                         userBaseInfoVO.setNickName(userAccountSimpleDTO.getNickName());
                                                         userBaseInfoVO.setRegion(userAccountSimpleDTO.getRegion());
+                                                        userBaseInfoVO.setIsPilot(userAccountSimpleDTO.getIsPilot());
                                                         vo.setUserBaseInfo(userBaseInfoVO);
                                                         break;
                                                     }
@@ -519,6 +520,7 @@ public class DynamicServiceImpl implements DynamicService {
                                         userBaseInfoVO.setNickName(userAccountSimpleDTO.getNickName());
                                         userBaseInfoVO.setUserImg(userAccountSimpleDTO.getUserImg());
                                         userBaseInfoVO.setRegion(userAccountSimpleDTO.getRegion());
+                                        userBaseInfoVO.setIsPilot(userAccountSimpleDTO.getIsPilot());
                                         dynamicVO.setUserBaseInfo(userBaseInfoVO);
                                     }
                                     // 设置是否点赞

release-service/src/main/resources/mapper/requirements/RequirementsDao.xml

@@ -739,6 +739,7 @@
         ri.publish_phone,
         ri.publisher_number,
         ri.service_id,
+        ri.service_name,
         ra.total_amount,
         ri.insurance,
         ra.order_level,
@@ -811,6 +812,7 @@
         ri.publish_phone,
         ri.publisher_number,
         ri.service_id,
+        ri.service_name,
         ra.total_amount,
         ri.insurance,
         sf.doing,