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

src/main/java/com/xjrsoft/module/generator/entity/ImportConfig.java

@@ -0,0 +1,38 @@
+package com.xjrsoft.module.generator.entity;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import org.hibernate.validator.constraints.Length;
+
+import javax.validation.constraints.NotNull;
+
+@Data
+public class ImportConfig {
+    /**
+     * 字段
+     */
+    @NotNull(message = "字段不能为空！")
+    @Length(max = 30, message = "字段长度不能超过30！")
+    private String fieldName;
+
+    /**
+     * 字段名称
+     */
+    @NotNull(message = "字段名称不能为空！")
+    @Length(max = 20, message = "字段名称不能超过20！")
+    private String label;
+
+    /**
+     * 宽度
+     */
+    private Integer width;
+
+    /**
+     * 是否必填
+     */
+    @ApiModelProperty("是否必填")
+    private Boolean required;
+
+    @ApiModelProperty("排序码")
+    private Integer sortCode;
+}

src/main/java/com/xjrsoft/module/generator/entity/ListConfig.java

@@ -29,6 +29,11 @@ public class ListConfig {
      */
     private Integer pageSize;
 
+    /**
+     * 导入模版名称
+     */
+    private String importTemplateName;
+
     /**
      * 左侧菜单配置
      */
@@ -44,6 +49,11 @@ public class ListConfig {
      */
     private List<ColumnConfig> columnConfigs;
 
+    /**
+     * 导入模版配置
+     */
+    private List<ImportConfig> importConfigs;
+
     /**
      * 按钮配置
      */