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

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

@@ -29,6 +29,11 @@ public class ListConfig {
      */
     private Integer pageSize;
 
+    /**
+     * 导入模版url
+     */
+    private String importTemplateUrl;
+
     /**
      * 导入模版名称
      */