Merge branch 'master' of http://git.hzwlsoft.com/laws-nio/laws-weilai

jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/entity/SysCategory.java

@@ -99,6 +99,9 @@ public class SysCategory implements Serializable,Comparable<SysCategory>{
 	@TableLogic
 	public Integer delFlag;
 
+	@Excel(name = "字典项值", width = 30)
+	private java.lang.String itemValue;
+
 	@Override
 	public int compareTo(SysCategory o) {
 		//比较条件我们定的是按照code的长度升序

jero-boot/jero-boot-modules/src/main/java/com/jero/modules/document/service/impl/BussDocumentLibraryEOServiceImpl.java

@@ -444,6 +444,7 @@ public class BussDocumentLibraryEOServiceImpl extends ServiceImpl<BussDocumentLi
         }
         if (replaceStandardNameList.size() != 0) {
             dataList.get(0).put("replace_standard", StringUtils.join(replaceStandardNameList, ","));
+            dataList.get(0).put("replace_standard_id", replaceStandardTemp);
         }
         //代替标准中文
 //        String replaceStandard = (String) dataList.get(0).get("replace_standard");