Merge remote-tracking branch 'origin/master'

whepi-web/src/main/java/com/bofeng/entity/UserRole.java

@@ -1,7 +1,9 @@
 package com.bofeng.entity;
 
 import com.baomidou.mybatisplus.annotations.TableField;
+import com.baomidou.mybatisplus.annotations.TableId;
 import com.baomidou.mybatisplus.annotations.TableName;
+import io.swagger.annotations.ApiModelProperty;
 import lombok.Getter;
 import lombok.Setter;
 import org.joda.time.DateTime;
@@ -11,31 +13,43 @@ import org.joda.time.DateTime;
 @TableName("sys_user_role")
 public class UserRole {
 
-    @TableField("ur_id")
+    @ApiModelProperty("用户角色关系ID")
+    @TableId("UR_ID")
     private Long urId;
 
-    @TableField("user_id")
+    @ApiModelProperty("用户ID")
+    @TableField("USER_ID")
     private Long userId;
 
-    /* 1.家庭；2.业委会 */
-    @TableField("role_id")
-    private Integer roleId;
+    @ApiModelProperty("角色ID:1居民,2业委会,3商家")
+    @TableField("ROLE_ID")
+    private int roleId;
 
-    @TableField("property_id")
+    @ApiModelProperty("启用状态：0未启用、1已启用（默认1）")
+    @TableField("STATUS")
+    private int status;
+
+    @ApiModelProperty("属性ID,居民门牌ID,业委会ID")
+    @TableField("PROPERTY_ID")
     private Long propertyId;
 
-    @TableField("user_create")
+    @ApiModelProperty("新增人")
+    @TableField("USER_CREATE")
     private Long userCreate;
 
+    @ApiModelProperty("新增时间")
     @TableField(exist = false)
     private DateTime timeCreate;
 
-    @TableField("user_update")
+    @ApiModelProperty("修改人")
+    @TableField("USER_UPDATE")
     private Long userUpdate;
 
+    @ApiModelProperty("修改时间")
     @TableField(exist = false)
     private DateTime timeUpdate;
 
+
     @TableField(exist = false)
     private UptownHome uptownHome;