Merge remote-tracking branch 'origin/master'

laws-modules/src/main/java/com/jero/modules/split/entity/SarFileSplitInfoEO.java

@@ -38,6 +38,7 @@ public class SarFileSplitInfoEO implements Serializable {
 
 	/**创建人*/
     @ApiModelProperty(value = "创建人")
+    @Dict(dictTable = "sys_user", dicCode = "username", dicText = "id")
     private String createBy;
 
 	/**拆分时间*/
@@ -130,7 +131,6 @@ public class SarFileSplitInfoEO implements Serializable {
     private String cut;
     @TableField(exist = false)
     private String documentId;
-
     /**ids*/
     @TableField(exist = false)
     private String ids;