Merge branch 'dev_ic_v2' of http://git.elinkit.com.cn:7070/r/epmet-cloud into dev_ic_v2

epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/form/demand/FinishStaffFromDTO.java

@@ -21,8 +21,8 @@ public class FinishStaffFromDTO implements Serializable {
     @NotBlank(message = "需求id不能为空", groups = AddUserInternalGroup.class)
     private String demandRecId;
 
-    @NotBlank(message = "服务方不能为空", groups = AddUserShowGroup.class)
-    private String serverId;
+    @NotBlank(message = "服务id不能为空", groups = AddUserShowGroup.class)
+    private String serviceId;
 
     @NotNull(message = "实际服务开始不能为空", groups = AddUserShowGroup.class)
     @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")

epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/IcUserDemandRecServiceImpl.java

@@ -417,7 +417,7 @@ public class IcUserDemandRecServiceImpl extends BaseServiceImpl<IcUserDemandRecD
         operateLogDao.insert(logEntity);
 
         //3、更新服务记录
-        IcUserDemandServiceEntity serviceEntity=demandServiceDao.selectById(formDTO.getServerId());
+        IcUserDemandServiceEntity serviceEntity=demandServiceDao.selectById(formDTO.getServiceId());
         if(null==serviceEntity){
             throw new RenException(EpmetErrorCode.DEMAND_SERVICE_NOT_EXITS.getCode(), EpmetErrorCode.DEMAND_SERVICE_NOT_EXITS.getMsg());
         }