Merge branch 'cc_20240806_skip_assessment_report' into 'master'

developmentManagerUserId

See merge request hangzhou/java/custom_zxjp!14

coolstore-partner-model/src/main/java/com/cool/store/vo/point/PointDetailVO.java

@@ -50,6 +50,9 @@ public class PointDetailVO {
     @ApiModelProperty("扩展经理名称")
     private String developmentManagerUserName;
 
+    @ApiModelProperty("扩展经理名称")
+    private String developmentManagerUserId;
+
     @ApiModelProperty("拓展时间")
     private Date developmentTime;
 

coolstore-partner-service/src/main/java/com/cool/store/service/impl/PointServiceImpl.java

@@ -117,6 +117,7 @@ public class PointServiceImpl implements PointService {
         String userName = enterpriseUserDAO.getUserName(pointInfo.getDevelopmentManager());
         PointDetailVO result = PointDetailVO.convertVO(pointInfo, pointDetailInfo);
         result.setDevelopmentManagerUserName(userName);
+        result.setDevelopmentManagerUserId(pointInfo.getDevelopmentManager());
         result.setRegionNodeName(regionService.getBelongWarRegionName(pointInfo.getRegionId()));
         if(Objects.nonNull(isGetNodeNo) && isGetNodeNo){
             result.setCurNodeNo(pointTodoInfoDAO.getCurNodeNoByPoint(pointId));