Merge remote-tracking branch 'origin/dev_ic_mp' into develop

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

@@ -415,6 +415,7 @@ public class IcUserDemandRecServiceImpl extends BaseServiceImpl<IcUserDemandRecD
             // 3.2插入评价操作日志
             IcUserDemandOperateLogEntity evaluateEntity=ConvertUtils.sourceToTarget(logEntity,IcUserDemandOperateLogEntity.class);
             evaluateEntity.setActionCode(UserDemandConstant.EVALUATE);
+            evaluateEntity.setId(null);
             operateLogDao.insert(evaluateEntity);
 
             //3.4更新主表已评价标识，是否解决标识。