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

ace-modules/ace-admin-api/src/main/java/com/github/wxiaoqi/security/admin/entity/User.java

 package com.github.wxiaoqi.security.admin.entity;
 
+import io.swagger.annotations.ApiModelProperty;
+
 import javax.persistence.Column;
 import javax.persistence.GeneratedValue;
 import javax.persistence.Id;
@@ -38,9 +40,16 @@ public class User {
     private Integer status;
 
     @Column(name = "zone_id")
+    @ApiModelProperty("片区id")
     private Integer zoneId;
 
+
+    @Column(name = "corporation_id")
+    @ApiModelProperty("公司id")
+    private Integer corporationId;
+
     @Column(name = "company_id")
+    @ApiModelProperty("门店id")
     private Integer companyId;
 
     private String description;