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

jero-boot/jero-boot-modules/src/main/java/com/jero/modules/compare/entity/SarFileCompareMenuVo.java

@@ -1,5 +1,7 @@
 package com.jero.modules.compare.entity;
 
+import com.jero.modules.system.util.StringUtils;
+
 import java.util.ArrayList;
 import java.util.List;
 
@@ -25,7 +27,10 @@ public class SarFileCompareMenuVo extends SarFileCompareMenu {
         this.setLeftOrRight(menu.getLeftOrRight());
         this.setItemName(menu.getItemName());
         this.setKey(menu.getId());
-        this.setTitle(menu.getName() + menu.getItemName());
+        this.setTitle(menu.getName());
+        if(StringUtils.isNoneBlank(menu.getItemName())){
+            this.setTitle(menu.getName() + menu.getItemName());
+        }
         this.setRemarks(menu.getRemarks());
     }
 

jero-boot/jero-boot-modules/src/main/java/com/jero/modules/extRepo/service/impl/ExtRepoDataServiceImpl.java

@@ -81,6 +81,7 @@ public class ExtRepoDataServiceImpl extends ServiceImpl<ExtRepoDataMapper, ExtRe
     public void editById(ExtRepoData extRepoData) {
         Date now = new Date();
         extRepoData.setUpdateTime(now);
+        extRepoData.setCreateTime(null);
         saveOrUpdate(extRepoData);
     }