diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/AddressController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/AddressController.java
index 6d5e324fa..3e156572f 100755
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/AddressController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/AddressController.java
@@ -2,6 +2,7 @@ package com.ruoyi.web.controller.system;
 
 import java.util.List;
 
+import com.ruoyi.framework.util.ShiroUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.apache.shiro.authz.annotation.RequiresPermissions;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -29,8 +30,7 @@ import com.ruoyi.common.core.page.TableDataInfo;
  */
 @Controller
 @RequestMapping("/system/address")
-public class AddressController extends BaseController
-{
+public class AddressController extends BaseController {
     private final static String PREFIX = "system/address";
     private final static String ROOT = "0";
 
@@ -48,6 +48,9 @@ public class AddressController extends BaseController
     @GetMapping("/childrenList")
     @ResponseBody
     public List<Address> selectAddressByParentCode(String code) {
+
+        Long userId = ShiroUtils.getUserId();
+        //TODO 过滤未分配区域
         return addressService.selectAddressByParentCode(code);
     }
 
@@ -57,8 +60,7 @@ public class AddressController extends BaseController
     @RequiresPermissions("system:address:list")
     @GetMapping("/list")
     @ResponseBody
-    public TableDataInfo list(Address address)
-    {
+    public TableDataInfo list(Address address) {
         startPage();
         if (StringUtils.isBlank(address.getAreaCode())
                 || StringUtils.isBlank(address.getAreaName())
@@ -77,8 +79,7 @@ public class AddressController extends BaseController
     @Log(title = "地区信息", businessType = BusinessType.EXPORT)
     @PostMapping("/export")
     @ResponseBody
-    public AjaxResult export(Address address)
-    {
+    public AjaxResult export(Address address) {
         List<Address> list = addressService.selectAddressList(address);
         ExcelUtil<Address> util = new ExcelUtil<Address>(Address.class);
         return util.exportExcel(list, "address");
@@ -109,8 +110,7 @@ public class AddressController extends BaseController
      * 修改地区信息
      */
     @GetMapping("/edit/{id}")
-    public String edit(@PathVariable("id") Long id, ModelMap mmap)
-    {
+    public String edit(@PathVariable("id") Long id, ModelMap mmap) {
         Address address = addressService.selectAddressById(id);
         mmap.put("address", address);
         return PREFIX + "/edit";
diff --git a/ruoyi-admin/src/main/resources/templates/system/firm/firm.html b/ruoyi-admin/src/main/resources/templates/system/firm/firm.html
index 8bcb0a71f..7341c8c6e 100755
--- a/ruoyi-admin/src/main/resources/templates/system/firm/firm.html
+++ b/ruoyi-admin/src/main/resources/templates/system/firm/firm.html
@@ -36,29 +36,18 @@
                             </li>
                             <li>
                                 <label>省：</label>
-                                <select name="provinceForm"
+                                <select name="provinceForm" th:onchange="changeAreaCode('provinceSelect')"
                                         th:with="areas=${@iAddressService.selectAddressByParentCode('0')}">
-                                    <option th:each="area : ${areas}"
-                                            th:text="${area.areaName}"
-                                            th:value="${area.areaCode}" onclick="alert(0)"/>
                                 </select>
                             </li>
                             <li>
                                 <label>市：</label>
-                                <select name="provinceForm"
-                                        th:with="areas=${@iAddressService.selectAddressByParentCode('0')}">
-                                    <option th:each="area : ${areas}"
-                                            th:text="${area.areaName}"
-                                            th:value="${area.areaCode}" onclick="alert(0)"/>
+                                <select id="countrySelect" name="countryCode" th:onchange="changeAreaCode('countrySelect')">
                                 </select>
                             </li>
                             <li>
                                 <label>县：</label>
-                                <select name="provinceForm"
-                                        th:with="areas=${@iAddressService.selectAddressByParentCode('0')}">
-                                    <option th:each="area : ${areas}"
-                                            th:text="${area.areaName}"
-                                            th:value="${area.areaCode}" onclick="alert(0)"/>
+                                <select id="townSelect" name="townCode" th:onchange="changeAreaCode('townSelect')">
                                 </select>
                             </li>
 
@@ -93,7 +82,7 @@
         </div>
     </div>
     <th:block th:include="include :: footer" />
-    <script th:inline="javascript">
+    <script language="JavaScript" th:inline="javascript">
         var editFlag = [[${@permission.hasPermi('system:firm:edit')}]];
         var removeFlag = [[${@permission.hasPermi('system:firm:remove')}]];
         var prefix = ctx + "system/firm";
@@ -232,6 +221,43 @@
             };
             $.table.init(options);
         });
+
+
+        function changeAreaCode(selectId) {
+            var code = '0';
+            var nextSelectId = "";
+            if ("provinceSelect" == selectId) {
+                $("#citySelect").empty();
+                $("#countrySelect").empty();
+                $("#townSelect").empty();
+                code = $("#provinceSelect").find("option:selected").attr("value");
+                nextSelectId = "citySelect";
+            } else if ("citySelect" == selectId) {
+                code = $("#citySelect").find("option:selected").attr("value");
+                nextSelectId = "countrySelect";
+            } else if ("countrySelect" == selectId) {
+                code = $("#countrySelect").find("option:selected").attr("value");
+                nextSelectId = "townSelect";
+            } else if ("townSelect" == selectId) {
+            }
+
+            $.ajax({
+                url: '/system/address/childrenList',
+                dataType : "json",
+                async:true,
+                data:{code:code},
+                success:function (result) {
+                    var str='<option value="">--请选择--</option>';
+                    for (var i = 0; i < result.length; i++) {
+                        str+='<option value='+result[i].areaCode+'>'+result[i].areaName+'</option>';
+                    }
+                    $("#" + nextSelectId + "").html(str);
+                }
+
+            });
+        }
+
+
     </script>
 </body>
 </html>
\ No newline at end of file
diff --git a/ruoyi-generator/src/main/resources/vm/java/controller.java.vm b/ruoyi-generator/src/main/resources/vm/java/controller.java.vm
index 7b4bf470b..1104b4977 100644
--- a/ruoyi-generator/src/main/resources/vm/java/controller.java.vm
+++ b/ruoyi-generator/src/main/resources/vm/java/controller.java.vm
@@ -32,8 +32,7 @@ import com.ruoyi.common.core.domain.Ztree;
  */
 @Controller
 @RequestMapping("/${moduleName}/${businessName}")
-public class ${ClassName}Controller extends BaseController
-{
+public class ${ClassName}Controller extends BaseController {
     private String prefix = "${moduleName}/${businessName}";
 
     @Autowired
@@ -53,8 +52,7 @@ public class ${ClassName}Controller extends BaseController
     @RequiresPermissions("${permissionPrefix}:list")
     @PostMapping("/list")
     @ResponseBody
-    public TableDataInfo list(${ClassName} ${className})
-    {
+    public TableDataInfo list(${ClassName} ${className}) {
         startPage();
         List<${ClassName}> list = ${className}Service.select${ClassName}List(${className});
         return getDataTable(list);
@@ -66,8 +64,7 @@ public class ${ClassName}Controller extends BaseController
     @RequiresPermissions("${permissionPrefix}:list")
     @PostMapping("/list")
     @ResponseBody
-    public List<${ClassName}> list(${ClassName} ${className})
-    {
+    public List<${ClassName}> list(${ClassName} ${className}) {
         List<${ClassName}> list = ${className}Service.select${ClassName}List(${className});
         return list;
     }
@@ -80,8 +77,7 @@ public class ${ClassName}Controller extends BaseController
     @Log(title = "${functionName}", businessType = BusinessType.EXPORT)
     @PostMapping("/export")
     @ResponseBody
-    public AjaxResult export(${ClassName} ${className})
-    {
+    public AjaxResult export(${ClassName} ${className}) {
         List<${ClassName}> list = ${className}Service.select${ClassName}List(${className});
         ExcelUtil<${ClassName}> util = new ExcelUtil<${ClassName}>(${ClassName}.class);
         return util.exportExcel(list, "${businessName}");
@@ -101,10 +97,8 @@ public class ${ClassName}Controller extends BaseController
      * 新增${functionName}
      */
     @GetMapping(value = { "/add/{${pkColumn.javaField}}", "/add/" })
-    public String add(@PathVariable(value = "${pkColumn.javaField}", required = false) Long ${pkColumn.javaField}, ModelMap mmap)
-    {
-        if (StringUtils.isNotNull(${pkColumn.javaField}))
-        {
+    public String add(@PathVariable(value = "${pkColumn.javaField}", required = false) Long ${pkColumn.javaField}, ModelMap mmap) {
+        if (StringUtils.isNotNull(${pkColumn.javaField})) {
             mmap.put("${className}", ${className}Service.select${ClassName}ById(${pkColumn.javaField}));
         }
         return prefix + "/add";
@@ -118,8 +112,7 @@ public class ${ClassName}Controller extends BaseController
     @Log(title = "${functionName}", businessType = BusinessType.INSERT)
     @PostMapping("/add")
     @ResponseBody
-    public AjaxResult addSave(${ClassName} ${className})
-    {
+    public AjaxResult addSave(${ClassName} ${className}) {
         return toAjax(${className}Service.insert${ClassName}(${className}));
     }
 
@@ -127,8 +120,7 @@ public class ${ClassName}Controller extends BaseController
      * 修改${functionName}
      */
     @GetMapping("/edit/{${pkColumn.javaField}}")
-    public String edit(@PathVariable("${pkColumn.javaField}") ${pkColumn.javaType} ${pkColumn.javaField}, ModelMap mmap)
-    {
+    public String edit(@PathVariable("${pkColumn.javaField}") ${pkColumn.javaType} ${pkColumn.javaField}, ModelMap mmap) {
         ${ClassName} ${className} = ${className}Service.select${ClassName}ById(${pkColumn.javaField});
         mmap.put("${className}", ${className});
         return prefix + "/edit";
@@ -141,8 +133,7 @@ public class ${ClassName}Controller extends BaseController
     @Log(title = "${functionName}", businessType = BusinessType.UPDATE)
     @PostMapping("/edit")
     @ResponseBody
-    public AjaxResult editSave(${ClassName} ${className})
-    {
+    public AjaxResult editSave(${ClassName} ${className}) {
         return toAjax(${className}Service.update${ClassName}(${className}));
     }
 
@@ -166,8 +157,7 @@ public class ${ClassName}Controller extends BaseController
     @Log(title = "${functionName}", businessType = BusinessType.DELETE)
     @GetMapping("/remove/{${pkColumn.javaField}}")
     @ResponseBody
-    public AjaxResult remove(@PathVariable("${pkColumn.javaField}") ${pkColumn.javaType} ${pkColumn.javaField})
-    {
+    public AjaxResult remove(@PathVariable("${pkColumn.javaField}") ${pkColumn.javaType} ${pkColumn.javaField}) {
         return toAjax(${className}Service.delete${ClassName}ById(${pkColumn.javaField}));
     }
 #end
@@ -178,8 +168,7 @@ public class ${ClassName}Controller extends BaseController
      */
 #set($BusinessName=$businessName.substring(0,1).toUpperCase() + ${businessName.substring(1)})
     @GetMapping(value = { "/select${BusinessName}Tree/{${pkColumn.javaField}}", "/select${BusinessName}Tree/" })
-    public String select${BusinessName}Tree(@PathVariable(value = "${pkColumn.javaField}", required = false) Long ${pkColumn.javaField}, ModelMap mmap)
-    {
+    public String select${BusinessName}Tree(@PathVariable(value = "${pkColumn.javaField}", required = false) Long ${pkColumn.javaField}, ModelMap mmap) {
         if (StringUtils.isNotNull(${pkColumn.javaField}))
         {
             mmap.put("${className}", ${className}Service.select${ClassName}ById(${pkColumn.javaField}));
@@ -192,8 +181,7 @@ public class ${ClassName}Controller extends BaseController
      */
     @GetMapping("/treeData")
     @ResponseBody
-    public List<Ztree> treeData()
-    {
+    public List<Ztree> treeData() {
         List<Ztree> ztrees = ${className}Service.select${ClassName}Tree();
         return ztrees;
     }
diff --git a/ruoyi-generator/src/main/resources/vm/java/domain.java.vm b/ruoyi-generator/src/main/resources/vm/java/domain.java.vm
index 76e51b030..794323fc0 100644
--- a/ruoyi-generator/src/main/resources/vm/java/domain.java.vm
+++ b/ruoyi-generator/src/main/resources/vm/java/domain.java.vm
@@ -23,6 +23,7 @@ import com.ruoyi.common.core.domain.TreeEntity;
 #elseif($table.tree)
 #set($Entity="TreeEntity")
 #end
+@Data
 public class ${ClassName} extends ${Entity}
 {
     private static final long serialVersionUID = 1L;
@@ -56,29 +57,8 @@ public class ${ClassName} extends ${Entity}
 #else
 #set($AttrName=$column.javaField.substring(0,1).toUpperCase() + ${column.javaField.substring(1)})
 #end
-    public void set${AttrName}($column.javaType $column.javaField) 
-    {
-        this.$column.javaField = $column.javaField;
-    }
-
-    public $column.javaType get${AttrName}() 
-    {
-        return $column.javaField;
-    }
 #end
 #end
 
-    @Override
-    public String toString() {
-        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
-#foreach ($column in $columns)
-#if($column.javaField.length() > 2 && $column.javaField.substring(1,2).matches("[A-Z]"))
-#set($AttrName=$column.javaField)
-#else
-#set($AttrName=$column.javaField.substring(0,1).toUpperCase() + ${column.javaField.substring(1)})
-#end
-            .append("${column.javaField}", get${AttrName}())
-#end
-            .toString();
-    }
+
 }
diff --git a/ruoyi-generator/src/main/resources/vm/java/mapper.java.vm b/ruoyi-generator/src/main/resources/vm/java/mapper.java.vm
index 6e20c516a..cebd4df1c 100644
--- a/ruoyi-generator/src/main/resources/vm/java/mapper.java.vm
+++ b/ruoyi-generator/src/main/resources/vm/java/mapper.java.vm
@@ -9,8 +9,7 @@ import ${packageName}.domain.${ClassName};
  * @author ${author}
  * @date ${datetime}
  */
-public interface ${ClassName}Mapper 
-{
+public interface ${ClassName}Mapper {
     /**
      * 查询${functionName}
      * 
diff --git a/ruoyi-generator/src/main/resources/vm/java/service.java.vm b/ruoyi-generator/src/main/resources/vm/java/service.java.vm
index e073cc82b..6d1909d3c 100644
--- a/ruoyi-generator/src/main/resources/vm/java/service.java.vm
+++ b/ruoyi-generator/src/main/resources/vm/java/service.java.vm
@@ -12,8 +12,7 @@ import com.ruoyi.common.core.domain.Ztree;
  * @author ${author}
  * @date ${datetime}
  */
-public interface I${ClassName}Service 
-{
+public interface I${ClassName}Service {
     /**
      * 查询${functionName}
      * 
diff --git a/ruoyi-generator/src/main/resources/vm/java/serviceImpl.java.vm b/ruoyi-generator/src/main/resources/vm/java/serviceImpl.java.vm
index 57923cd6e..d6e649f9a 100644
--- a/ruoyi-generator/src/main/resources/vm/java/serviceImpl.java.vm
+++ b/ruoyi-generator/src/main/resources/vm/java/serviceImpl.java.vm
@@ -26,8 +26,7 @@ import com.ruoyi.common.core.text.Convert;
  * @date ${datetime}
  */
 @Service
-public class ${ClassName}ServiceImpl implements I${ClassName}Service 
-{
+public class ${ClassName}ServiceImpl implements I${ClassName}Service {
     @Autowired
     private ${ClassName}Mapper ${className}Mapper;
 
@@ -38,8 +37,7 @@ public class ${ClassName}ServiceImpl implements I${ClassName}Service
      * @return ${functionName}
      */
     @Override
-    public ${ClassName} select${ClassName}ById(${pkColumn.javaType} ${pkColumn.javaField})
-    {
+    public ${ClassName} select${ClassName}ById(${pkColumn.javaType} ${pkColumn.javaField}) {
         return ${className}Mapper.select${ClassName}ById(${pkColumn.javaField});
     }
 
@@ -50,8 +48,7 @@ public class ${ClassName}ServiceImpl implements I${ClassName}Service
      * @return ${functionName}
      */
     @Override
-    public List<${ClassName}> select${ClassName}List(${ClassName} ${className})
-    {
+    public List<${ClassName}> select${ClassName}List(${ClassName} ${className}) {
         return ${className}Mapper.select${ClassName}List(${className});
     }
 
@@ -63,8 +60,7 @@ public class ${ClassName}ServiceImpl implements I${ClassName}Service
      */
     @Override
     @Transactional(rollbackFor = Exception.class)
-    public int insert${ClassName}(${ClassName} ${className})
-    {
+    public int insert${ClassName}(${ClassName} ${className}) {
 #foreach ($column in $columns)
 #if($column.javaField == 'createTime')
         ${className}.setCreateTime(DateUtils.getNowDate());
@@ -81,8 +77,7 @@ public class ${ClassName}ServiceImpl implements I${ClassName}Service
      */
     @Override
     @Transactional(rollbackFor = Exception.class)
-    public int update${ClassName}(${ClassName} ${className})
-    {
+    public int update${ClassName}(${ClassName} ${className}) {
 #foreach ($column in $columns)
 #if($column.javaField == 'updateTime')
         ${className}.setUpdateTime(DateUtils.getNowDate());
@@ -99,8 +94,7 @@ public class ${ClassName}ServiceImpl implements I${ClassName}Service
      */
     @Override
     @Transactional(rollbackFor = Exception.class)
-    public int delete${ClassName}ByIds(String ids)
-    {
+    public int delete${ClassName}ByIds(String ids) {
         return ${className}Mapper.delete${ClassName}ByIds(Convert.toStrArray(ids));
     }
 
@@ -111,8 +105,7 @@ public class ${ClassName}ServiceImpl implements I${ClassName}Service
      * @return 结果
      */
     @Override
-    public int delete${ClassName}ById(${pkColumn.javaType} ${pkColumn.javaField})
-    {
+    public int delete${ClassName}ById(${pkColumn.javaType} ${pkColumn.javaField}) {
         return ${className}Mapper.delete${ClassName}ById(${pkColumn.javaField});
     }
 #if($table.tree)
@@ -123,12 +116,10 @@ public class ${ClassName}ServiceImpl implements I${ClassName}Service
      * @return 所有${functionName}信息
      */
     @Override
-    public List<Ztree> select${ClassName}Tree()
-    {
+    public List<Ztree> select${ClassName}Tree() {
         List<${ClassName}> ${className}List = ${className}Mapper.select${ClassName}List(new ${ClassName}());
         List<Ztree> ztrees = new ArrayList<Ztree>();
-        for (${ClassName} ${className} : ${className}List)
-        {
+        for (${ClassName} ${className} : ${className}List) {
             Ztree ztree = new Ztree();
 #set($TreeCode=$treeCode.substring(0,1).toUpperCase() + ${treeCode.substring(1)})
 #set($TreeParentCode=$treeParentCode.substring(0,1).toUpperCase() + ${treeParentCode.substring(1)})