Merge remote-tracking branch 'origin/develop_master_new' into develop_master_new

This commit is contained in:
CD
2022-12-05 14:58:25 +08:00
2 changed files with 39 additions and 5 deletions
@@ -70,9 +70,9 @@ public class EsRevisePlanLogServiceImpl extends ServiceImpl<EsRevisePlanLogDao,
case "4":
//更名
String renameEs = (String) qbfsForm.get("renameEs");
//if(!esName.equals(renameEs)) {
if(!esName.equals(renameEs)) {
msg = msg + "修改了《" + esName + "》 , “企标名称”由“" + esName + "”改为“" + renameEs + "”;";
//}
}
break;
}
if (ObjectUtils.isNotEmpty(esId)&&ObjectUtils.isEmpty(esId1)&&ObjectUtils.isEmpty(esId2)) {