feature 修改清空冲突的逻辑

cx-aps/cx-aps-common/src/main/java/com/rongwei/bscommon/sys/service/impl/ApsProcessOperationProcessEquServiceImpl.java

@@ -842,10 +842,11 @@ public class ApsProcessOperationProcessEquServiceImpl extends ServiceImpl<ApsPro
                 info.setHasconflict(StringUtils.isBlank(info.getConflictdes()) &&
                         StringUtils.isBlank(info.getSoftconflictdes()) ?
                         LOCKMARK_N : LOCKMARK_Y);
-            } else {
-                info.setConflictdes(addNewConflictsDesc(info.getConflictdes(), removeConflictsDesc));
-                info.setHasconflict(LOCKMARK_Y);
             }
+//            else {
+//                info.setConflictdes(addNewConflictsDesc(info.getConflictdes(), removeConflictsDesc));
+//                info.setHasconflict(LOCKMARK_Y);
+//            }
         });
         this.updateBatchById(beforeUpdatingConflictId);
     }