实体信息写法更新

fuint-application/src/main/java/com/fuint/common/dto/AccountDto.java

@@ -1,218 +1,68 @@
 package com.fuint.common.dto;
 
+import com.fasterxml.jackson.annotation.JsonFormat;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Getter;
+import lombok.Setter;
 import java.util.Date;
 
 /**
  * 后台账户实体类
+ *
+ * Created by FSQ
+ * CopyRight https://www.fuint.cn
  */
+@Getter
+@Setter
 public class AccountDto {
 
-    /**
-     * 账户主键id
-     */
+    @ApiModelProperty("账户主键id")
     private Integer id;
 
-    /**
-     * 账户编码
-     */
+    @ApiModelProperty("账户编码")
     private String accountKey;
 
-    /**
-     * 账户名称
-     */
+    @ApiModelProperty("账户名称")
     private String accountName;
-    /**
-     * 密码
-     */
+
+    @ApiModelProperty("密码")
     private String password;
 
-    /**
-     * 账户状态
-     * 状态 : 0 无效 1 有效
-     */
+    @ApiModelProperty("状态 : 0 无效 1 有效")
     private int accountStatus;
 
-    /**
-     * 是否激活
-     * 状态 : 0 未激活 1已激活
-     */
+    @ApiModelProperty("激活状态 : 0 未激活 1已激活")
     private int isActive;
 
-    /**
-     * 创建时间
-     */
+    @ApiModelProperty("创建时间")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
     private Date createDate;
 
-    /**
-     * 修改时间
-     */
+    @ApiModelProperty("修改时间")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
     private Date modifyDate;
 
-    /**
-     * 随机码（公盐）
-     */
+    @ApiModelProperty("随机码（公盐）")
     private String salt;
 
-    /**
-     * 是否被锁定
-     */
+    @ApiModelProperty("是否被锁定")
     private int locked;
 
-    /**
-     * 管理员真实姓名
-     */
+    @ApiModelProperty("真实姓名")
     private String realName;
 
-    /**
-     * 所属店铺id
-     */
-    private Integer storeId;
-
-    /**
-     * 所属店铺名称
-     */
-    private String storeName;
-
-    /**
-     * 员工ID
-     */
-    private Integer staffId;
-
-    /**
-     * 所属商户
-     */
+    @ApiModelProperty("所属商户ID")
     private Integer merchantId;
 
-    /**
-     * 所属商户名称
-     */
+    @ApiModelProperty("所属商户名称")
     private String merchantName;
 
-    public Integer getId() {
-        return id;
-    }
-
-    public void setId(Integer id) {
-        this.id = id;
-    }
-
-    public String getAccountKey() {
-        return accountKey;
-    }
-
-    public void setAccountKey(String accountKey) {
-        this.accountKey = accountKey;
-    }
-
-    public String getAccountName() {
-        return accountName;
-    }
-
-    public void setAccountName(String accountName) {
-        this.accountName = accountName;
-    }
-
-    public String getPassword() {
-        return password;
-    }
-
-    public void setPassword(String password) {
-        this.password = password;
-    }
-
-    public int getAccountStatus() {
-        return accountStatus;
-    }
-
-    public void setAccountStatus(int accountStatus) {
-        this.accountStatus = accountStatus;
-    }
-
-    public int getIsActive() {
-        return isActive;
-    }
-
-    public void setIsActive(int isActive) {
-        this.isActive = isActive;
-    }
-
-    public Date getCreateDate() {
-        return createDate;
-    }
-
-    public void setCreateDate(Date createDate) {
-        this.createDate = createDate;
-    }
-
-    public Date getModifyDate() {
-        return modifyDate;
-    }
-
-    public void setModifyDate(Date modifyDate) {
-        this.modifyDate = modifyDate;
-    }
-
-    public String getSalt() {
-        return salt;
-    }
-
-    public void setSalt(String salt) {
-        this.salt = salt;
-    }
-
-    public int getLocked() {
-        return locked;
-    }
-
-    public void setLocked(int locked) {
-        this.locked = locked;
-    }
-
-    public String getRealName() {
-        return realName;
-    }
-
-    public void setRealName(String realName) {
-        this.realName = realName;
-    }
-
-    public Integer getStoreId() {
-        return storeId;
-    }
-
-    public void setStoreId(Integer storeId) {
-        this.storeId = storeId;
-    }
-
-    public void setStoreName(String storeName) {
-        this.storeName = storeName;
-    }
-
-    public String getStoreName() {
-        return storeName;
-    }
-
-    public void setStaffId(Integer staffId) {
-        this.staffId = staffId;
-    }
-
-    public Integer getStaffId() {
-        return staffId;
-    }
-
-    public Integer getMerchantId() {
-        return merchantId;
-    }
-
-    public void setMerchantId(Integer merchantId) {
-        this.merchantId = merchantId;
-    }
+    @ApiModelProperty("所属店铺ID")
+    private Integer storeId;
 
-    public void setMerchantName(String merchantName) {
-        this.merchantName = merchantName;
-    }
+    @ApiModelProperty("所属店铺名称")
+    private String storeName;
 
-    public String getMerchantName() {
-        return merchantName;
-    }
+    @ApiModelProperty("关联员工ID")
+    private Integer staffId;
 }

fuint-application/src/main/java/com/fuint/common/dto/AccountInfo.java

@@ -1,11 +1,13 @@
 package com.fuint.common.dto;
 
+import com.fasterxml.jackson.annotation.JsonFormat;
+import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import java.io.Serializable;
 import java.util.Date;
 
 /**
- * 后台账号信息
+ * 后台登录账号信息
  *
  * Created by FSQ
  * CopyRight https://www.fuint.cn
@@ -13,23 +15,60 @@ import java.util.Date;
 @Data
 public class AccountInfo implements Serializable {
 
+    @ApiModelProperty("账户主键id")
     private Integer id;
+
+    @ApiModelProperty("账户编码")
     private String accountKey;
+
+    @ApiModelProperty("账户名称")
     private String accountName;
+
+    @ApiModelProperty("状态 : 0 无效 1 有效")
     private int accountStatus;
+
+    @ApiModelProperty("激活状态 : 0 未激活 1已激活")
     private String isActive;
+
+    @ApiModelProperty("创建时间")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
     private Date createDate;
+
+    @ApiModelProperty("修改时间")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
     private Date modifyDate;
+
+    @ApiModelProperty("随机码（公盐）")
     private String salt;
+
+    @ApiModelProperty("所属角色ID")
     private String roleIds;
+
+    @ApiModelProperty("是否被锁定")
     private int locked;
+
+    @ApiModelProperty("从属对象")
     private int ownerId;
+
+    @ApiModelProperty("真实姓名")
     private String realName;
+
+    @ApiModelProperty("所属商户ID")
     private Integer merchantId;
+
+    @ApiModelProperty("所属商户名称")
     private String merchantName;
+
+    @ApiModelProperty("所属店铺ID")
     private Integer storeId;
+
+    @ApiModelProperty("所属店铺名称")
     private String storeName;
+
+    @ApiModelProperty("关联员工ID")
     private Integer staffId;
+
+    @ApiModelProperty("登录的Token")
     private String token;
 
 }

fuint-application/src/main/java/com/fuint/common/dto/AddressDto.java

@@ -1,109 +1,55 @@
 package com.fuint.common.dto;
 
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Getter;
+import lombok.Setter;
+
+/**
+ * 会员地址信息
+ *
+ * Created by FSQ
+ * CopyRight https://www.fuint.cn
+ */
+@Getter
+@Setter
 public class AddressDto {
 
+    @ApiModelProperty("账户主键ID")
     private Integer id;
 
+    @ApiModelProperty("会员ID")
     private Integer userId;
 
+    @ApiModelProperty("会员名称")
     private String name;
 
+    @ApiModelProperty("会员手机号")
     private String mobile;
 
+    @ApiModelProperty("省份ID")
     private Integer provinceId;
 
+    @ApiModelProperty("省份名称")
     private String provinceName;
 
+    @ApiModelProperty("城市ID")
     private Integer cityId;
 
+    @ApiModelProperty("城市名称")
     private String cityName;
 
+    @ApiModelProperty("区ID")
     private Integer regionId;
 
+    @ApiModelProperty("区名称")
     private String regionName;
 
+    @ApiModelProperty("详细地址")
     private String detail;
 
+    @ApiModelProperty("是否默认地址")
     private String isDefault;
 
+    @ApiModelProperty("状态")
     private String status;
-
-    public Integer getId(){
-        return id;
-    }
-    public void setId(Integer id){
-        this.id=id;
-    }
-    public Integer getUserId(){
-        return userId;
-    }
-    public void setUserId(Integer userId){
-        this.userId=userId;
-    }
-    public String getName(){
-        return name;
-    }
-    public void setName(String name){
-        this.name=name;
-    }
-    public String getMobile(){
-        return mobile;
-    }
-    public void setMobile(String mobile){
-        this.mobile=mobile;
-    }
-    public Integer getProvinceId(){
-        return provinceId;
-    }
-    public void setProvinceId(Integer provinceId){
-        this.provinceId=provinceId;
-    }
-    public String getProvinceName(){
-        return provinceName;
-    }
-    public void setProvinceName(String provinceName){
-        this.provinceName=provinceName;
-    }
-    public Integer getCityId(){
-        return cityId;
-    }
-    public void setCityId(Integer cityId){
-        this.cityId=cityId;
-    }
-    public String getCityName(){
-        return cityName;
-    }
-    public void setCityName(String cityName){
-        this.cityName=cityName;
-    }
-    public Integer getRegionId(){
-        return regionId;
-    }
-    public void setRegionId(Integer regionId){
-        this.regionId=regionId;
-    }
-    public String getRegionName(){
-        return regionName;
-    }
-    public void setRegionName(String regionName){
-        this.regionName=regionName;
-    }
-    public String getDetail(){
-        return detail;
-    }
-    public void setDetail(String detail){
-        this.detail=detail;
-    }
-    public String getIsDefault(){
-        return isDefault;
-    }
-    public void setIsDefault(String isDefault){
-        this.isDefault=isDefault;
-    }
-    public String getStatus(){
-        return status;
-    }
-    public void setStatus(String status){
-        this.status=status;
-    }
 }

fuint-application/src/main/java/com/fuint/common/dto/UserGroupDto.java

@@ -1,7 +1,5 @@
 package com.fuint.common.dto;
 
-import com.baomidou.mybatisplus.annotation.*;
-
 import java.io.Serializable;
 import java.util.Date;
 import java.util.List;
@@ -22,7 +20,6 @@ public class UserGroupDto implements Serializable {
     private static final long serialVersionUID = 1L;
 
     @ApiModelProperty("分组ID")
-    @TableId(value = "ID", type = IdType.AUTO)
     private Integer id;
 
     @ApiModelProperty("分组名称")