fixed 实体类set、get方法

fuint-application/src/main/java/com/fuint/common/domain/TreeNode.java

@@ -1,5 +1,10 @@
 package com.fuint.common.domain;
 
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Getter;
+import lombok.Setter;
+
+import java.io.Serializable;
 import java.util.ArrayList;
 import java.util.List;
 
@@ -9,213 +14,56 @@ import java.util.List;
  * Created by FSQ
  * CopyRight https://www.fuint.cn
  */
-public class TreeNode {
+@Getter
+@Setter
+public class TreeNode implements Serializable {
 
-    /**
-     * 菜单ID
-     */
+    @ApiModelProperty("菜单ID")
     private long id;
 
-    /**
-     * 菜单名称
-     */
+    @ApiModelProperty("菜单名称")
     private String name;
 
-    /**
-     * 菜单名称(字母)
-     */
+    @ApiModelProperty("菜单名称(字母)")
     private String ename;
 
-    /**
-     * tree 节点是否打开
-     */
+    @ApiModelProperty("节点是否打开")
     private boolean open;
 
-    /**
-     * 是否菜单
-     * */
+    @ApiModelProperty("是否菜单")
     private int isMenu;
 
-    /**
-     * tree 节点是否选中
-     */
+    @ApiModelProperty("节点是否选中")
     private boolean checked;
 
-    /**
-     * url
-     */
+    @ApiModelProperty("url")
     private String url;
 
-    /**
-     * path
-     */
+    @ApiModelProperty("路径")
     private String path;
 
-    /**
-     * 权限标识
-     */
+    @ApiModelProperty("权限标识")
     private String perms;
 
-    /**
-     * 子菜单
-     */
+    @ApiModelProperty("子菜单")
     private List<TreeNode> childrens = new ArrayList<TreeNode>();
 
-    /**
-     * 菜单级别
-     */
+    @ApiModelProperty("菜单级别")
     private int level;
 
-    /**
-     * 上级菜单
-     */
+    @ApiModelProperty("上级菜单")
     private long pId;
 
-    /**
-     * 图标
-     */
+    @ApiModelProperty("图标")
     private String icon;
 
-    /**
-     * 新图标
-     */
+    @ApiModelProperty("新图标")
     private String newIcon;
 
-    /**
-     * 排序
-     * */
+    @ApiModelProperty("排序")
     private Integer sort;
 
-    /**
-     * 状态
-     * */
+    @ApiModelProperty("状态")
     private String status;
 
-    public long getId() {
-        return id;
-    }
-
-    public void setId(long id) {
-        this.id = id;
-    }
-
-    public String getName() {
-        return name;
-    }
-
-    public void setName(String name) {
-        this.name = name;
-    }
-
-    public String getEname() {
-        return ename;
-    }
-
-    public void setEname(String ename) {
-        this.ename = ename;
-    }
-
-    public boolean isOpen() {
-        return open;
-    }
-
-    public int getIsMenu() {
-        return isMenu;
-    }
-
-    public void setIsMenu(int isMenu) {
-        this.isMenu = isMenu;
-    }
-
-    public void setOpen(boolean open) {
-        this.open = open;
-    }
-
-    public boolean isChecked() {
-        return checked;
-    }
-
-    public void setChecked(boolean checked) {
-        this.checked = checked;
-    }
-
-    public List<TreeNode> getChildrens() {
-        return childrens;
-    }
-
-    public void setChildrens(List<TreeNode> childrens) {
-        this.childrens = childrens;
-    }
-
-    public int getLevel() {
-        return level;
-    }
-
-    public void setLevel(int level) {
-        this.level = level;
-    }
-
-    public long getpId() {
-        return pId;
-    }
-
-    public void setpId(long pId) {
-        this.pId = pId;
-    }
-
-    public String getUrl() {
-        return url;
-    }
-
-    public void setUrl(String url) {
-        this.url = url;
-    }
-
-    public String getPath() {
-        return path;
-    }
-
-    public void setPath(String path) {
-        this.path = path;
-    }
-
-    public String getPerms() {
-        return perms;
-    }
-
-    public void setPerms(String perms) {
-        this.perms = perms;
-    }
-
-    public String getIcon() {
-        return icon;
-    }
-
-    public void setIcon(String icon) {
-        this.icon = icon;
-    }
-
-    public String getNewIcon() {
-        return newIcon;
-    }
-
-    public void setNewIcon(String newIcon) {
-        this.newIcon = newIcon;
-    }
-
-    public Integer getSort() {
-        return sort;
-    }
-
-    public void setSort(Integer sort) {
-        this.sort = sort;
-    }
-
-    public String getStatus() {
-        return status;
-    }
-
-    public void setStatus(String status) {
-        this.status = status;
-    }
 }

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

@@ -107,10 +107,10 @@ public class OrderDto implements Serializable {
 
     @ApiModelProperty("订单状态")
     private String status;
-
+    
     @ApiModelProperty("支付状态")
     private String payStatus;
-    
+
     @ApiModelProperty("最后操作人")
     private String operator;
 

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

@@ -1,110 +1,51 @@
 package com.fuint.common.dto;
 
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Getter;
+import lombok.Setter;
+
 import java.io.Serializable;
 import java.util.List;
 
 /**
- * 订单实体类
- * */
+ * 订单商品实体类
+ *
+ * Created by FSQ
+ * CopyRight https://www.fuint.cn
+ */
+@Getter
+@Setter
 public class OrderGoodsDto implements Serializable {
+
+    @ApiModelProperty("自增ID")
     private Integer id;
 
+    @ApiModelProperty("商品ID")
     private Integer goodsId;
 
+    @ApiModelProperty("订单类型")
     private String type;
 
+    @ApiModelProperty("商品名称")
     private String name;
 
+    @ApiModelProperty("价格")
     private String price;
 
+    @ApiModelProperty("折扣")
     private String discount;
 
+    @ApiModelProperty("购买数量")
     private Integer num;
 
+    @ApiModelProperty("图片")
     private String image;
 
+    @ApiModelProperty("skuId")
     private Integer skuId;
 
+    @ApiModelProperty("规格列表")
     private List<GoodsSpecValueDto> specList;
 
-    public Integer getId() {
-        return id;
-    }
-
-    public void setId(Integer id) {
-        this.id = id;
-    }
-
-    public Integer getGoodsId() {
-        return goodsId;
-    }
-
-    public void setGoodsId(Integer goodsId) {
-        this.goodsId = goodsId;
-    }
-
-    public String getType() {
-        return type;
-    }
-
-    public void setType(String type) {
-        this.type = type;
-    }
-
-    public String getName() {
-        return name;
-    }
-
-    public void setName(String name) {
-        this.name = name;
-    }
-
-    public String getPrice() {
-        return price;
-    }
-
-    public void setPrice(String price) {
-        this.price = price;
-    }
-
-    public String getDiscount() {
-        return discount;
-    }
-
-    public void setDiscount(String discount) {
-        this.discount = discount;
-    }
-
-    public Integer getNum() {
-        return num;
-    }
-
-    public void setNum(Integer num) {
-        this.num = num;
-    }
-
-    public String getImage() {
-        return image;
-    }
-
-    public void setImage(String image) {
-        this.image = image;
-    }
-
-    public Integer getSkuId() {
-        return skuId;
-    }
-
-    public void setSkuId(Integer skuId) {
-        this.skuId = skuId;
-    }
-
-    public List<GoodsSpecValueDto> getSpecList() {
-        return specList;
-    }
-
-    public void setSpecList(List<GoodsSpecValueDto> specList) {
-        this.specList = specList;
-    }
 }
 

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

@@ -1,5 +1,8 @@
 package com.fuint.common.dto;
 
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Getter;
+import lombok.Setter;
 import java.io.Serializable;
 
 /**
@@ -8,77 +11,26 @@ import java.io.Serializable;
  * Created by FSQ
  * CopyRight https://www.fuint.cn
  */
+@Getter
+@Setter
 public class OrderUserDto implements Serializable {
 
-    /**
-     * 会员ID
-     * */
+    @ApiModelProperty("会员ID")
     private Integer id;
 
-    /**
-     * 姓名
-     */
+    @ApiModelProperty("会员姓名")
     private String name;
 
-    /**
-     * 手机
-     * */
+    @ApiModelProperty("会员手机")
     private String mobile;
 
-    /**
-     * 证件类型
-     * */
+    @ApiModelProperty("证件类型")
     private String cardType;
 
-    /**
-     * 证件号
-     * */
+    @ApiModelProperty("证件号")
     private String cardNo;
 
-    /**
-     * 地址
-     * */
+    @ApiModelProperty("地址")
     private String address;
 
-    public Integer getId() {
-        return id;
-    }
-    public void setId(Integer id) {
-        this.id = id;
-    }
-
-    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 String getCardType() {
-        return cardType;
-    }
-    public void setCardType(String cardType) {
-        this.cardType = cardType;
-    }
-
-    public String getCardNo() {
-        return cardNo;
-    }
-    public void setCardNo(String cardNo) {
-        this.cardNo = cardNo;
-    }
-
-    public String getAddress() {
-        return address;
-    }
-    public void setAddress(String address) {
-        this.address = address;
-    }
 }

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

@@ -8,18 +8,17 @@ import java.io.Serializable;
  * Created by FSQ
  * CopyRight https://www.fuint.cn
  */
-public class Page implements Serializable{
-    private static final long serialVersionUID = -7956811510222855939L;
+public class Page implements Serializable {
 
     private static final Long DEFAULT_PAGE_NO = 1L;
     private static final Long DEFAULT_PAGE_SIZE = 100L;
 
-    private Long pageNo;//页号
-    private Long pageSize;//每页行数
-    private Long totalRows;//总行数
-    private Long totalPages;//总页数
-    private Boolean firstPage;//是否首页
-    private Boolean lastPage;//是否尾页
+    private Long pageNo;// 页号
+    private Long pageSize;// 每页行数
+    private Long totalRows;// 总行数
+    private Long totalPages;// 总页数
+    private Boolean firstPage;// 是否首页
+    private Boolean lastPage;// 是否尾页
 
     public Page() {
     }

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

@@ -1,34 +1,28 @@
 package com.fuint.common.dto;
 
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Getter;
+import lombok.Setter;
+
+import java.io.Serializable;
+
 /**
  * 请求参数实体类
  *
  * Created by FSQ
  * CopyRight https://www.fuint.cn
  */
-public class ParamDto {
+@Getter
+@Setter
+public class ParamDto implements Serializable {
+
+    @ApiModelProperty("参数键值")
     private String key;
-    private String name;
-    private String value;
 
-    public String getKey(){
-        return key;
-    }
-    public void setKey(String key){
-        this.key = key;
-    }
+    @ApiModelProperty("参数名称")
+    private String name;
 
-    public String getName(){
-        return name;
-    }
-    public void setName(String name){
-        this.name = name;
-    }
+    @ApiModelProperty("参数值")
+    private String value;
 
-    public String getValue(){
-        return value;
-    }
-    public void setValue(String value){
-        this.value = value;
-    }
 }

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

@@ -1,6 +1,10 @@
 package com.fuint.common.dto;
 
 import com.fuint.repository.model.MtUser;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Getter;
+import lombok.Setter;
+
 import java.io.Serializable;
 import java.util.Date;
 
@@ -10,135 +14,39 @@ import java.util.Date;
  * Created by FSQ
  * CopyRight https://www.fuint.cn
  */
+@Getter
+@Setter
 public class PointDto implements Serializable {
-    /**
-     * 自增ID
-     */
+
+    @ApiModelProperty("自增ID")
     private Integer id;
 
-    /**
-     * 会员ID
-     */
+    @ApiModelProperty("会员ID")
     private Integer userId;
 
-    /**
-     * 会员信息
-     */
+    @ApiModelProperty("会员信息")
     private MtUser userInfo;
 
-    /**
-     * 订单号
-     */
+    @ApiModelProperty("订单号")
     private String orderSn;
 
-    /**
-     * 积分变化数量
-     */
+    @ApiModelProperty("积分变化数量")
     private Integer amount;
 
-    /**
-     * 创建时间
-     */
+    @ApiModelProperty("创建时间")
     private Date createTime;
 
-    /**
-     * 更新时间
-     */
+    @ApiModelProperty("更新时间")
     private Date updateTime;
 
-    /**
-     * 备注说明
-     */
+    @ApiModelProperty("备注说明")
     private String description;
 
-    /**
-     * 最后操作人
-     */
+    @ApiModelProperty("最后操作人")
     private String operator;
 
-    /**
-     * 状态，A正常；D作废
-     */
+    @ApiModelProperty("状态，A正常；D删除")
     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 MtUser getUserInfo() {
-        return userInfo;
-    }
-
-    public void setUserInfo(MtUser userInfo) {
-        this.userInfo = userInfo;
-    }
-
-    public String getOrderSn() {
-        return orderSn;
-    }
-
-    public void setOrderSn(String orderSn) {
-        this.orderSn = orderSn;
-    }
-
-    public Integer getAmount() {
-        return amount;
-    }
-
-    public void setAmount(Integer amount) {
-        this.amount = amount;
-    }
-
-    public Date getCreateTime() {
-        return createTime;
-    }
-
-    public void setCreateTime(Date createTime) {
-        this.createTime = createTime;
-    }
-
-    public Date getUpdateTime() {
-        return updateTime;
-    }
-
-    public void setUpdateTime(Date updateTime) {
-        this.updateTime = updateTime;
-    }
-
-    public String getDescription() {
-        return description;
-    }
-
-    public void setDescription(String description) {
-        this.description = description;
-    }
-
-    public String getStatus() {
-        return status;
-    }
-
-    public void setStatus(String status) {
-        this.status = status;
-    }
-
-    public String getOperator(){
-        return operator;
-    }
-
-    public void setOperator(String operator){
-        this.operator=operator;
-    }
 }
 

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

@@ -1,27 +1,25 @@
 package com.fuint.common.dto;
 
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Getter;
+import lombok.Setter;
+
+import java.io.Serializable;
+
 /**
  * 预存规则实体类
  *
  * Created by FSQ
  * CopyRight https://www.fuint.cn
  */
-public class PreStoreRuleDto {
+@Getter
+@Setter
+public class PreStoreRuleDto implements Serializable {
 
+    @ApiModelProperty("预存金额")
     private String preStoreAmount;
-    private String targetAmount;
 
-    public String getPreStoreAmount() {
-        return preStoreAmount;
-    }
-    public void setPreStoreAmount(String preStoreAmount) {
-        this.preStoreAmount = preStoreAmount;
-    }
+    @ApiModelProperty("目标金额")
+    private String targetAmount;
 
-    public String getTargetAmount() {
-        return targetAmount;
-    }
-    public void setTargetAmount(String targetAmount) {
-        this.targetAmount = targetAmount;
-    }
 }

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

@@ -1,27 +1,25 @@
 package com.fuint.common.dto;
 
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Getter;
+import lombok.Setter;
+
+import java.io.Serializable;
+
 /**
  * 充值规则实体类
  *
  * Created by FSQ
  * CopyRight https://www.fuint.cn
  */
-public class RechargeRuleDto {
+@Getter
+@Setter
+public class RechargeRuleDto implements Serializable {
 
+    @ApiModelProperty("充值金额")
     private String rechargeAmount;
-    private String giveAmount;
 
-    public String getRechargeAmount() {
-        return rechargeAmount;
-    }
-    public void setRechargeAmount(String rechargeAmount) {
-        this.rechargeAmount = rechargeAmount;
-    }
+    @ApiModelProperty("赠送金额")
+    private String giveAmount;
 
-    public String getGiveAmount() {
-        return giveAmount;
-    }
-    public void setGiveAmount(String giveAmount) {
-        this.giveAmount = giveAmount;
-    }
 }

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

@@ -1,5 +1,9 @@
 package com.fuint.common.dto;
 
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Getter;
+import lombok.Setter;
+
 import java.io.Serializable;
 import java.math.BigDecimal;
 import java.util.List;
@@ -10,227 +14,60 @@ import java.util.List;
  * Created by FSQ
  * CopyRight https://www.fuint.cn
  */
+@Getter
+@Setter
 public class RefundDto implements Serializable {
 
-    /**
-     * 自增ID
-     */
+    @ApiModelProperty("自增ID")
     private Integer id;
 
-    /**
-     * 订单ID
-     */
+    @ApiModelProperty("订单ID")
     private Integer orderId;
 
-    /**
-     * 商户ID
-     */
+    @ApiModelProperty("商户ID")
     private Integer merchantId;
 
-    /**
-     * 店铺ID
-     */
+    @ApiModelProperty("店铺ID")
     private Integer storeId;
 
-    /**
-     * 退款金额
-     */
+    @ApiModelProperty("退款金额")
     private BigDecimal amount;
 
-    /**
-     * 售后类型
-     */
+    @ApiModelProperty("售后类型")
     private String type;
 
-    /**
-     * 会员ID
-     */
+    @ApiModelProperty("会员ID")
     private Integer userId;
 
-    /**
-     * 用户备注
-     */
+    @ApiModelProperty("用户备注")
     private String remark;
 
-    /**
-     * 创建时间
-     */
-    private String createTime;
-
-    /**
-     * 更新时间
-     */
-    private String updateTime;
-
-    /**
-     * 状态
-     */
-    private String status;
-
-    /**
-     * 状态
-     */
-    private String statusText;
-
-    /**
-     * 申请凭证图片
-     */
+    @ApiModelProperty("申请凭证图片")
     private List<String> imageList;
 
-    /**
-     * 申请凭证图片
-     */
+    @ApiModelProperty("申请凭证图片")
     private String images;
 
-    /**
-     * 最后操作人
-     */
+    @ApiModelProperty("最后操作人")
     private String operator;
 
-    /**
-     * 订单详情
-     * */
+    @ApiModelProperty("订单详情")
     private UserOrderDto orderInfo;
 
-    /**
-     * 退货地址
-     */
+    @ApiModelProperty("退货地址")
     private AddressDto address;
 
-    public Integer getId() {
-        return id;
-    }
-
-    public void setId(Integer id) {
-        this.id = id;
-    }
-
-    public Integer getOrderId() {
-        return orderId;
-    }
-
-    public void setOrderId(Integer orderId) {
-        this.orderId = orderId;
-    }
-
-    public Integer getUserId() {
-        return userId;
-    }
-
-    public void setUserId(Integer userId) {
-        this.userId = userId;
-    }
-
-    public Integer getMerchantId(){
-        return merchantId;
-    }
-
-    public void setMerchantId(Integer merchantId){
-        this.merchantId=merchantId;
-    }
-
-    public Integer getStoreId(){
-        return storeId;
-    }
-
-    public void setStoreId(Integer storeId){
-        this.storeId=storeId;
-    }
-
-    public BigDecimal getAmount(){
-        return amount;
-    }
-
-    public void setAmount(BigDecimal amount){
-        this.amount=amount;
-    }
-
-    public String getType(){
-        return type;
-    }
-
-    public void setType(String type){
-        this.type=type;
-    }
-
-    public String getRemark() {
-        return remark;
-    }
-
-    public void setRemark(String remark) {
-        this.remark = remark;
-    }
-
-    public String getCreateTime() {
-        return createTime;
-    }
-
-    public void setCreateTime(String createTime) {
-        this.createTime = createTime;
-    }
-
-    public String getUpdateTime() {
-        return updateTime;
-    }
-
-    public void setUpdateTime(String updateTime) {
-        this.updateTime = updateTime;
-    }
-
-    public String getStatus() {
-        return status;
-    }
-
-    public void setStatus(String status) {
-        this.status = status;
-    }
-
-    public String getStatusText() {
-        return statusText;
-    }
-
-    public void setStatusText(String statusText) {
-        this.statusText = statusText;
-    }
-
-    public List<String> getImageList(){
-        return imageList;
-    }
-
-    public void setImageList(List<String> imageList){
-        this.imageList=imageList;
-    }
-
-    public String getImages() {
-        return images;
-    }
-
-    public void setImages(String images) {
-        this.images = images;
-    }
-
-    public String getOperator() {
-        return operator;
-    }
-
-    public void setOperator(String operator) {
-        this.operator = operator;
-    }
+    @ApiModelProperty("创建时间")
+    private String createTime;
 
-    public UserOrderDto getOrderInfo() {
-        return orderInfo;
-    }
+    @ApiModelProperty("更新时间")
+    private String updateTime;
 
-    public void setOrderInfo(UserOrderDto orderInfo) {
-        this.orderInfo = orderInfo;
-    }
+    @ApiModelProperty("状态")
+    private String status;
 
-    public AddressDto getAddress() {
-        return address;
-    }
+    @ApiModelProperty("状态说明")
+    private String statusText;
 
-    public void setAddress(AddressDto address) {
-        this.address = address;
-    }
 }
 

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

@@ -1,66 +1,41 @@
 package com.fuint.common.dto;
 
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Getter;
+import lombok.Setter;
+
+import java.io.Serializable;
 import java.util.List;
 
 /**
  * 地区实体类
- * */
-public class RegionDto {
-
+ *
+ * Created by FSQ
+ * CopyRight https://www.fuint.cn
+ */
+@Getter
+@Setter
+public class RegionDto implements Serializable {
+
+    @ApiModelProperty("自增ID")
     private Integer id;
 
+    @ApiModelProperty("名称")
     private String name;
 
+    @ApiModelProperty("父ID")
     private Integer pid;
 
+    @ApiModelProperty("编码")
     private String code;
 
+    @ApiModelProperty("层级")
     private String level;
 
+    @ApiModelProperty("城市")
     private List<RegionDto> city;
 
+    @ApiModelProperty("区域")
     private List<RegionDto> region;
 
-    public Integer getId(){
-        return id;
-    }
-    public void setId(Integer id){
-        this.id=id;
-    }
-    public String getName(){
-        return name;
-    }
-    public void setName(String name){
-        this.name=name;
-    }
-    public Integer getPid(){
-        return pid;
-    }
-    public void setPid(Integer pid){
-        this.pid=pid;
-    }
-    public String getCode(){
-        return code;
-    }
-    public void setCode(String code){
-        this.code=code;
-    }
-    public String getLevel(){
-        return level;
-    }
-    public void setLevel(String level){
-        this.level=level;
-    }
-    public List<RegionDto> getCity() {
-       return city;
-    }
-    public void setCity(List<RegionDto> city) {
-        this.city = city;
-    }
-    public List<RegionDto> getRegion() {
-        return region;
-    }
-    public void setRegion(List<RegionDto> region) {
-        this.region = region;
-    }
 }

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

@@ -1,5 +1,9 @@
 package com.fuint.common.dto;
 
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Getter;
+import lombok.Setter;
+
 import java.io.Serializable;
 import java.math.BigDecimal;
 
@@ -9,399 +13,107 @@ import java.math.BigDecimal;
  * Created by FSQ
  * CopyRight https://www.fuint.cn
  */
+@Getter
+@Setter
 public class ReqCouponDto implements Serializable {
 
-    /**
-     * 券ID
-     */
+    @ApiModelProperty("卡券ID")
     private Integer id;
 
-    /**
-     * 商户ID
-     */
+    @ApiModelProperty("商户ID")
     private Integer merchantId;
 
-    /**
-     * 店铺ID
-     */
+    @ApiModelProperty("店铺ID")
     private Integer storeId;
 
-    /**
-     * 分组ID
-     * */
+    @ApiModelProperty("分组ID")
     private Integer groupId;
 
-    /**
-     * 类型
-     */
+    @ApiModelProperty("类型")
     private String type;
 
-    /**
-     * 名称
-     */
+    @ApiModelProperty("名称")
     private String name;
 
-    /**
-     * 是否允许转赠
-     */
+    @ApiModelProperty("是否允许转赠")
     private Integer isGive;
 
-    /**
-     * 获得卡券所消耗积分
-     */
+    @ApiModelProperty("获得卡券所消耗积分")
     private Integer point;
 
-    /**
-     * 获得计次卡卡所消耗积分
-     */
+    @ApiModelProperty("获得计次卡卡所消耗积分")
     private Integer timerPoint;
 
-    /**
-     * 领取码
-     */
+    @ApiModelProperty("领取码")
     private String receiveCode;
 
-    /**
-     * 使用专项
-     */
+    @ApiModelProperty("使用专项")
     private String useFor;
 
-    /**
-     * 过期类型
-     */
+    @ApiModelProperty("过期类型")
     private String expireType;
 
-    /**
-     * 有效天数
-     */
+    @ApiModelProperty("有效天数")
     private Integer expireTime;
 
-    /**
-     * 计次卡领取码
-     */
+    @ApiModelProperty("计次卡领取码")
     private String timerReceiveCode;
 
-    /**
-     * 有效期开始时间
-     * */
+    @ApiModelProperty("有效期开始时间")
     private String beginTime;
 
-    /**
-     * 有效期结束时间
-     * */
+    @ApiModelProperty("有效期结束时间")
     private String endTime;
 
-    /**
-     * 价值金额
-     * */
+    @ApiModelProperty("价值金额")
     private BigDecimal amount;
 
-    /**
-     * 发放方式
-     * */
+    @ApiModelProperty("发放方式")
     private String sendWay;
 
-    /**
-     * 适用商品
-     * */
+    @ApiModelProperty("适用商品")
     private String applyGoods;
 
-    /**
-     * 每次发放数量
-     * */
-     private Integer sendNum;
+    @ApiModelProperty("每次发放数量")
+    private Integer sendNum;
 
-    /**
-     * 发行总数量
-     * */
+    @ApiModelProperty("发行总数量")
     private Integer total;
 
-    /**
-     * 每人最多拥有数量
-     * */
+    @ApiModelProperty("每人最多拥有数量")
     private Integer limitNum;
 
-     /**
-      * 例外时间
-      * */
-     private String exceptTime;
+    @ApiModelProperty("例外时间")
+    private String exceptTime;
 
-    /**
-     * 适用店铺Id
-     * */
+    @ApiModelProperty("适用店铺ID，逗号分隔")
     private String storeIds;
 
-    /**
-     * 会员等级Id
-     * */
+    @ApiModelProperty("会员等级ID，逗号分隔")
     private String gradeIds;
 
-    /**
-     * 适用商品
-     * */
+    @ApiModelProperty("适用商品")
     private String goodsIds;
 
-    /**
-     * 后台备注
-     * */
+    @ApiModelProperty("后台备注")
     private String remarks;
 
-    /**
-     * 图片
-     * */
+    @ApiModelProperty("图片")
     private String image;
 
-    /**
-     * 备注
-     */
+    @ApiModelProperty("备注")
     private String description;
 
-    /**
-     * 预存规则
-     * */
+    @ApiModelProperty("预存规则")
     private String inRule;
 
-    /**
-     * 核销规则
-     * */
+    @ApiModelProperty("核销规则")
     private String outRule;
 
-    /**
-     * 操作人
-     */
+    @ApiModelProperty("操作人")
     private String operator;
 
-    /**
-     * 状态
-     * */
+    @ApiModelProperty("状态")
     private String status;
 
-    public Integer getId() {
-        return id;
-    }
-    public void setId(Integer id) {
-        this.id = id;
-    }
-
-    public Integer getMerchantId() {
-        return merchantId;
-    }
-    public void setMerchantId(Integer merchantId) {
-        this.merchantId = merchantId;
-    }
-
-    public Integer getStoreId() {
-        return storeId;
-    }
-    public void setStoreId(Integer storeId) {
-        this.storeId = storeId;
-    }
-
-    public Integer getGroupId() {
-        return groupId;
-    }
-    public void setGroupId(Integer groupId) {
-        this.groupId = groupId;
-    }
-
-    public String getType() {
-        return type;
-    }
-    public void setType(String type) {
-        this.type = type;
-    }
-
-    public String getName() {
-        return name;
-    }
-    public void setName(String name) {
-        this.name = name;
-    }
-
-    public Integer getIsGive(){
-        return isGive;
-    }
-    public void setIsGive(Integer isGive){
-        this.isGive=isGive;
-    }
-
-    public Integer getPoint(){
-        return point;
-    }
-    public void setPoint(Integer point){
-        this.point=point;
-    }
-
-    public Integer getTimerPoint(){
-        return timerPoint;
-    }
-    public void setTimerPoint(Integer timerPoint){
-        this.timerPoint=timerPoint;
-    }
-
-    public String getReceiveCode(){
-        return receiveCode;
-    }
-    public void setReceiveCode(String receiveCode){
-        this.receiveCode=receiveCode;
-    }
-
-    public String getUseFor(){
-        return useFor;
-    }
-    public void setUseFor(String useFor){
-        this.useFor=useFor;
-    }
-
-    public String getExpireType(){
-        return expireType;
-    }
-    public void setExpireType(String expireType){
-        this.expireType=expireType;
-    }
-
-    public Integer getExpireTime(){
-        return expireTime;
-    }
-    public void setExpireType(Integer expireTime){
-        this.expireTime=expireTime;
-    }
-
-    public String getTimerReceiveCode(){
-        return timerReceiveCode;
-    }
-    public void setTimerReceiveCode(String timerReceiveCode){
-        this.timerReceiveCode=timerReceiveCode;
-    }
-
-    public String getBeginTime() {
-        return beginTime;
-    }
-    public void setBeginTime(String beginTime) {
-        this.beginTime = beginTime;
-    }
-
-    public String getEndTime() {
-        return endTime;
-    }
-    public void setEndTime(String endTime) {
-        this.endTime = endTime;
-    }
-
-    public BigDecimal getAmount() {
-        return amount;
-    }
-    public void setAmount(BigDecimal amount) {
-        this.amount = amount;
-    }
-
-    public String getSendWay() {
-        return sendWay;
-    }
-    public void setSendWay(String sendWay) {
-        this.sendWay = sendWay;
-    }
-
-    public String getApplyGoods() {
-        return applyGoods;
-    }
-    public void setApplyGoods(String applyGoods) {
-        this.applyGoods = applyGoods;
-    }
-
-    public Integer getSendNum() {
-        return sendNum;
-    }
-    public void setSendNum(Integer sendNum) {
-        this.sendNum = sendNum;
-    }
-
-    public Integer getTotal() {
-        return total;
-    }
-    public void setTotal(Integer total) {
-        this.total = total;
-    }
-
-    public Integer getLimitNum() {
-        return limitNum;
-    }
-    public void setLimitNum(Integer limitNum) {
-        this.limitNum = limitNum;
-    }
-
-    public String getExceptTime() {
-        return exceptTime;
-    }
-    public void setExceptTime(String exceptTime) {
-        this.exceptTime = exceptTime;
-    }
-
-    public String getStoreIds() {
-        return storeIds;
-    }
-    public void setStoreIds(String storeIds) {
-        this.storeIds = storeIds;
-    }
-
-    public String getGradeIds() {
-        return gradeIds;
-    }
-    public void setGradeIds(String gradeIds) {
-        this.gradeIds = gradeIds;
-    }
-
-    public String getGoodsIds() {
-        return goodsIds;
-    }
-    public void setGoodsIds(String goodsIds) {
-        this.goodsIds = goodsIds;
-    }
-
-    public String getOperator() {
-        return operator;
-    }
-    public void setOperator(String operator) {
-        this.operator = operator;
-    }
-
-    public String getDescription() {
-        return description;
-    }
-    public void setDescription(String description) {
-        this.description = description;
-    }
-
-    public String getRemarks() {
-        return remarks;
-    }
-    public void setRemarks(String remarks) {
-        this.remarks = remarks;
-    }
-
-    public String getImage() {
-        return image;
-    }
-    public void setImage(String image) {
-        this.image = image;
-    }
-
-    public String getInRule() {
-        return inRule;
-    }
-    public void setInRule(String inRule) {
-        this.inRule = inRule;
-    }
-
-    public String getOutRule() {
-        return outRule;
-    }
-    public void setOutRule(String outRule) {
-        this.outRule = outRule;
-    }
-
-    public String getStatus() {
-        return status;
-    }
-    public void setStatus(String status) { this.status = status;}
 }

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

@@ -1,5 +1,8 @@
 package com.fuint.common.dto;
 
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Getter;
+import lombok.Setter;
 import java.io.Serializable;
 import java.math.BigDecimal;
 
@@ -9,121 +12,35 @@ import java.math.BigDecimal;
  * Created by FSQ
  * CopyRight https://www.fuint.cn
  */
+@Getter
+@Setter
 public class ReqCouponGroupDto implements Serializable {
-    /**
-     * ID
-     */
+
+    @ApiModelProperty("自增ID")
     private Integer id;
 
-    /**
-     * 商户ID
-     */
+    @ApiModelProperty("商户ID")
     private Integer merchantId;
 
-    /**
-     * 店铺ID
-     */
+    @ApiModelProperty("店铺ID")
     private Integer storeId;
 
-    /**
-     * 组名称
-     */
+    @ApiModelProperty("分组名称")
     private String name;
 
-    /**
-     * 价值金额
-     * */
+    @ApiModelProperty("价值金额")
     private BigDecimal money;
 
-    /**
-     * 发行数量
-     * */
-     private Integer total;
+    @ApiModelProperty("发行数量")
+    private Integer total;
 
-    /**
-     * 分组描述
-     */
+    @ApiModelProperty("分组描述")
     private String description;
 
-    /**
-     * 操作人
-     */
+    @ApiModelProperty("操作人")
     private String operator;
 
-    /**
-     * 状态
-     * */
+    @ApiModelProperty("状态")
     private String status;
 
-    public Integer getId() {
-        return id;
-    }
-
-    public void setId(Integer id) {
-        this.id = id;
-    }
-
-    public Integer getMerchantId() {
-        return merchantId;
-    }
-
-    public void setMerchantId(Integer merchantId) {
-        this.merchantId = merchantId;
-    }
-
-    public Integer getStoreId() {
-        return storeId;
-    }
-
-    public void setStoreId(Integer storeId) {
-        this.storeId = storeId;
-    }
-
-    public String getName() {
-        return name;
-    }
-
-    public void setName(String name) {
-        this.name = name;
-    }
-
-    public BigDecimal getMoney() {
-        return money;
-    }
-
-    public void setMoney(BigDecimal money) {
-        this.money = money;
-    }
-
-    public Integer getTotal() {
-        return total;
-    }
-
-    public void setTotal(Integer total) {
-        this.total = total;
-    }
-
-    public String getOperator() {
-        return operator;
-    }
-
-    public void setOperator(String operator) {
-        this.operator = operator;
-    }
-
-    public String getDescription() {
-        return description;
-    }
-
-    public void setDescription(String description) {
-        this.description = description;
-    }
-
-    public String getStatus() {
-        return status;
-    }
-
-    public void setStatus(String status) {
-        this.status = status;
-    }
 }

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

@@ -1,49 +1,31 @@
 package com.fuint.common.dto;
 
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Getter;
+import lombok.Setter;
 import java.io.Serializable;
 import java.util.Map;
 
 /**
- * 请求结果
+ * 请求返回结果
  *
  * Created by FSQ
  * CopyRight https://www.fuint.cn
  */
+@Getter
+@Setter
 public class ReqResult implements Serializable {
 
+    @ApiModelProperty("返回代码")
     private String code;
-    private String msg;
-    private boolean result;
-    private Map<String, Object> data;
-
-    public String getCode() {
-        return code;
-    }
-
-    public void setCode(String code) {
-        this.code = code;
-    }
 
-    public String getMsg() {
-        return msg;
-    }
-
-    public void setMsg(String msg) {
-        this.msg = msg;
-    }
+    @ApiModelProperty("返回消息")
+    private String msg;
 
-    public boolean isResult() {
-        return result;
-    }
+    @ApiModelProperty("返回结果")
+    private boolean result;
 
-    public void setResult(boolean result) {
-        this.result = result;
-    }
+    @ApiModelProperty("返回数据")
+    private Map<String, Object> data;
 
-    public void setData(Map<String, Object> data) {
-        this.data = data;
-    }
-    public Map<String, Object> getData() {
-        return this.data;
-    }
 }

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

@@ -1,51 +0,0 @@
-package com.fuint.common.dto;
-
-import java.io.Serializable;
-
-/**
- * 发放卡券请求DTO
- *
- * Created by FSQ
- * CopyRight https://www.fuint.cn
- */
-public class ReqSendCouponDto implements Serializable {
-
-    /**
-     * 分组ID
-     * */
-    private Integer group_id;
-
-    /**
-     * 手机号
-     */
-    private String mobile;
-
-    /**
-     * 发放数量
-     */
-    private Integer num;
-
-    public Integer getGroupId() {
-        return group_id;
-    }
-
-    public void setGroupId(Integer group_id) {
-        this.group_id = group_id;
-    }
-
-    public String getMobile() {
-        return mobile;
-    }
-
-    public void setMobile(String mobile) {
-        this.mobile = mobile;
-    }
-
-    public Integer getNum() {
-        return num;
-    }
-
-    public void setNum(Integer num) {
-        this.num = num;
-    }
-}

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

@@ -1,5 +1,9 @@
 package com.fuint.common.dto;
 
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Getter;
+import lombok.Setter;
+
 import java.io.Serializable;
 import java.util.Date;
 
@@ -9,209 +13,56 @@ import java.util.Date;
  * Created by FSQ
  * CopyRight https://www.fuint.cn
  */
+@Getter
+@Setter
 public class ReqSendLogDto implements Serializable {
 
-    /**
-     * ID
-     * */
+    @ApiModelProperty("自增ID")
     private Integer id;
 
-    /**
-     * 商户ID
-     */
+    @ApiModelProperty("商户ID")
     private Integer merchantId;
 
-    /**
-     * 店铺ID
-     */
+    @ApiModelProperty("店铺ID")
     private Integer storeId;
 
-    /**
-     * 1：单用户发券；2：批量发券
-     * */
+    @ApiModelProperty("类型，1：单用户发券；2：批量发券")
     private Integer type;
 
-    /**
-     * 会员ID
-     * */
-    private Integer user_id;
+    @ApiModelProperty("会员ID")
+    private Integer userId;
 
-    /**
-     * 导入文件名
-     */
-    private String file_name;
+    @ApiModelProperty("导入文件名")
+    private String fileName;
 
-    /**
-     * 导入文件路径
-     */
-    private String file_path;
+    @ApiModelProperty("导入文件路径")
+    private String filePath;
 
-    /**
-     * 手机号
-     */
+    @ApiModelProperty("手机号")
     private String mobile;
 
-    /**
-     * 分组ID
-     */
-    private Integer group_id;
-
-    /**
-     * 卡券ID
-     */
-    private Integer coupon_id;
-
-    /**
-     * 分组名称
-     */
-    private String group_name;
-
-    /**
-     * 发放数量
-     */
-    private Integer send_num;
-
-    /**
-     * 发放时间
-     * */
-    private Date create_time;
-
-    /**
-     * 操作人
-     */
-    private String operator;
-
-    /**
-     * 作态
-     */
-    private String status;
-
-    /**
-     * uuid
-     */
-    private String uuid;
-
-    public Integer getId() {
-        return id;
-    }
-
-    public void setId(Integer id) {
-        this.id = id;
-    }
-
-    public Integer getMerchantId() {
-        return merchantId;
-    }
-
-    public void setMerchantId(Integer merchantId) {
-        this.merchantId = merchantId;
-    }
-
-    public Integer getStoreId() {
-        return storeId;
-    }
-
-    public void setStoreId(Integer storeId) {
-        this.storeId = storeId;
-    }
-
-    public Integer getType() {
-        return type;
-    }
-
-    public void setType(Integer type) {
-        this.type = type;
-    }
-
-    public Integer getUserId() {
-        return user_id;
-    }
-
-    public void setUserId(Integer user_id) {
-        this.user_id = user_id;
-    }
-
-    public String getFileName() {
-        return file_name;
-    }
+    @ApiModelProperty("分组ID")
+    private Integer groupId;
 
-    public void setFileName(String file_name) {
-        this.file_name = file_name;
-    }
+    @ApiModelProperty("卡券ID")
+    private Integer couponId;
 
-    public String getFilePath() {
-        return file_path;
-    }
+    @ApiModelProperty("分组名称")
+    private String groupName;
 
-    public void setFilePath(String file_path) {
-        this.file_path = file_path;
-    }
+    @ApiModelProperty("发放数量")
+    private Integer sendNum;
 
-    public String getMobile() {
-        return mobile;
-    }
+    @ApiModelProperty("发放时间")
+    private Date createTime;
 
-    public void setMobile(String mobile) {
-        this.mobile = mobile;
-    }
-
-    public Integer getGroupId() {
-        return group_id;
-    }
-
-    public void setGroupId(Integer group_id) {
-        this.group_id = group_id;
-    }
-
-    public Integer getCouponId() {
-        return coupon_id;
-    }
-
-    public void setCouponId(Integer coupon_id) {
-        this.coupon_id = coupon_id;
-    }
-
-    public String getGroupName() {
-        return group_name;
-    }
-
-    public void setGroupName(String group_name) {
-        this.group_name = group_name;
-    }
-
-    public Integer getSendNum() {
-        return send_num;
-    }
-
-    public void setSendNum(Integer send_num) {
-        this.send_num = send_num;
-    }
-
-    public Date getCreateTime() {
-        return create_time;
-    }
-
-    public void setCreateTime(Date create_time) {
-        this.create_time = create_time;
-    }
-
-    public String getOperator() {
-        return operator;
-    }
-
-    public void setOperator(String operator) {
-        this.operator = operator;
-    }
-
-    public String getStatus() {
-        return status;
-    }
+    @ApiModelProperty("操作人")
+    private String operator;
 
-    public void setStatus(String status) { this.status = status;}
+    @ApiModelProperty("状态")
+    private String status;
 
-    public String getUuid() {
-        return uuid;
-    }
+    @ApiModelProperty("uuid")
+    private String uuid;
 
-    public void setUuid(String uuid) { this.uuid = uuid;}
 }

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

@@ -1,6 +1,10 @@
 package com.fuint.common.dto;
 
 import com.fuint.repository.model.MtGoods;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Getter;
+import lombok.Setter;
+
 import java.io.Serializable;
 import java.util.List;
 
@@ -10,108 +14,32 @@ import java.util.List;
  * Created by FSQ
  * CopyRight https://www.fuint.cn
  */
+@Getter
+@Setter
 public class ResCartDto implements Serializable {
 
-    /**
-     * ID
-     * */
+    @ApiModelProperty("自增ID")
     private Integer id;
 
-    /**
-     * 分类名称
-     */
+    @ApiModelProperty("会员ID")
     private Integer userId;
 
-    /**
-     * 商品ID
-     */
+    @ApiModelProperty("商品ID")
     private Integer goodsId;
 
-    /**
-     * skuID
-     */
+    @ApiModelProperty("skuId")
     private Integer skuId;
 
-    /**
-     * 数量
-     */
+    @ApiModelProperty("数量")
     private Integer num;
 
-    /**
-     * 是否有效
-     * */
+    @ApiModelProperty("是否有效")
     private Boolean isEffect;
 
-    /**
-     * 商品规格
-     * */
+    @ApiModelProperty("商品规格")
     private List<GoodsSpecValueDto> specList;
 
-    /**
-     * 商品数据
-     * */
+    @ApiModelProperty("商品数据")
     private MtGoods goodsInfo;
 
-    public Integer getId() {
-        return id;
-    }
-
-    public void setId(Integer id) {
-        this.id = id;
-    }
-
-    public Integer getUserId() {
-        return userId;
-    }
-
-    public void setUserId(Integer name) {
-        this.userId = name;
-    }
-
-    public Integer getGoodsId() {
-        return goodsId;
-    }
-
-    public void setGoodsId(Integer goodsId) {
-        this.goodsId = goodsId;
-    }
-
-    public Integer getSkuId(){
-        return skuId;
-    }
-    public void setSkuId(Integer skuId){
-        this.skuId=skuId;
-    }
-
-    public Integer getNum() {
-        return num;
-    }
-
-    public void setNum(Integer num) {
-        this.num = num;
-    }
-
-    public Boolean getIsEffect() {
-        return isEffect;
-    }
-
-    public void setIsEffect(Boolean isEffect) {
-        this.isEffect = isEffect;
-    }
-
-    public MtGoods getGoodsInfo() {
-        return goodsInfo;
-    }
-
-    public void setGoodsInfo(MtGoods goodsInfo) {
-        this.goodsInfo = goodsInfo;
-    }
-
-    public List<GoodsSpecValueDto> getSpecList() {
-        return specList;
-    }
-
-    public void setSpecList(List<GoodsSpecValueDto> specList) {
-        this.specList = specList;
-    }
 }

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

@@ -1,6 +1,10 @@
 package com.fuint.common.dto;
 
 import com.fuint.repository.model.MtGoods;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Getter;
+import lombok.Setter;
+
 import java.io.Serializable;
 import java.util.List;
 
@@ -10,57 +14,20 @@ import java.util.List;
  * Created by FSQ
  * CopyRight https://www.fuint.cn
  */
+@Getter
+@Setter
 public class ResCateDto implements Serializable {
 
-    /**
-     *  分类ID
-     * */
+    @ApiModelProperty("分类ID")
     private Integer cateId;
 
-    /**
-     * 分类名称
-     */
+    @ApiModelProperty("分类名称")
     private String name;
 
-    /**
-     * logo
-     */
+    @ApiModelProperty("logo")
     private String logo;
 
-    /**
-     * 数据列表
-     * */
+    @ApiModelProperty("商品列表")
     private List<MtGoods> goodsList;
 
-    public Integer getCateId() {
-        return cateId;
-    }
-
-    public void setCateId(Integer cateId) {
-        this.cateId = cateId;
-    }
-
-    public String getName() {
-        return name;
-    }
-
-    public void setName(String name) {
-        this.name = name;
-    }
-
-    public String getLogo() {
-        return logo;
-    }
-
-    public void setLogo(String logo) {
-        this.logo = logo;
-    }
-
-    public List<MtGoods> getGoodsList() {
-        return goodsList;
-    }
-
-    public void setGoodsList(List<MtGoods> goodsList) {
-        this.goodsList = goodsList;
-    }
 }

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

@@ -1,78 +0,0 @@
-package com.fuint.common.dto;
-
-import java.io.Serializable;
-import java.util.List;
-
-/**
- * 我的卡券返回DTO
- *
- * Created by FSQ
- * CopyRight https://www.fuint.cn
- */
-public class ResMyCouponDto implements Serializable {
-
-    /**
-     *  当前页
-     * */
-    private Integer pageNumber;
-
-    /**
-     * 每页数量
-     */
-    private Integer pageSize;
-
-    /**
-     * 总数量
-     */
-    private Long totalRow;
-
-    /**
-     * 总页数
-     * */
-    private Integer totalPage;
-
-    /**
-     * 数据列表
-     * */
-    private List<MyCouponDto> content;
-
-    public Integer getPageNumber() {
-        return pageNumber;
-    }
-
-    public void setPageNumber(Integer pageNumber) {
-        this.pageNumber = pageNumber;
-    }
-
-    public Integer getPageSize() {
-        return pageSize;
-    }
-
-    public void setPageSize(Integer pageSize) {
-        this.pageSize = pageSize;
-    }
-
-    public Long getTotalRow() {
-        return totalRow;
-    }
-
-    public void getTotalRow(Long totalRow) {
-        this.totalRow = totalRow;
-    }
-
-    public Integer getTotalPage() {
-        return totalPage;
-    }
-
-    public void setTotalPage(Integer totalPage) {
-        this.totalPage = totalPage;
-    }
-
-    public List<MyCouponDto> getContent() {
-        return content;
-    }
-
-    public void setContent(List<MyCouponDto> content) {
-        this.content = content;
-    }
-}

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

@@ -1,78 +0,0 @@
-package com.fuint.common.dto;
-
-import java.io.Serializable;
-import java.util.List;
-
-/**
- * 用户订单返回DTO
- *
- * Created by FSQ
- * CopyRight https://www.fuint.cn
- */
-public class ResUserOrderDto implements Serializable {
-
-    /**
-     *  当前页
-     * */
-    private Integer pageNumber;
-
-    /**
-     * 每页数量
-     */
-    private Integer pageSize;
-
-    /**
-     * 总数量
-     */
-    private Long totalRow;
-
-    /**
-     * 总页数
-     * */
-    private Integer totalPage;
-
-    /**
-     * 数据列表
-     * */
-    private List<UserOrderDto> content;
-
-    public Integer getPageNumber() {
-        return pageNumber;
-    }
-
-    public void setPageNumber(Integer pageNumber) {
-        this.pageNumber = pageNumber;
-    }
-
-    public Integer getPageSize() {
-        return pageSize;
-    }
-
-    public void setPageSize(Integer pageSize) {
-        this.pageSize = pageSize;
-    }
-
-    public Long getTotalRow() {
-        return totalRow;
-    }
-
-    public void getTotalRow(Long totalRow) {
-        this.totalRow = totalRow;
-    }
-
-    public Integer getTotalPage() {
-        return totalPage;
-    }
-
-    public void setTotalPage(Integer totalPage) {
-        this.totalPage = totalPage;
-    }
-
-    public List<UserOrderDto> getContent() {
-        return content;
-    }
-
-    public void setContent(List<UserOrderDto> content) {
-        this.content = content;
-    }
-}

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

@@ -1,85 +1,35 @@
 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 RoleDto {
 
-    /**
-     * 账户主键id
-     */
+    @ApiModelProperty("账户主键ID")
     private Long id;
 
-    /**
-     * 商户ID
-     * */
+    @ApiModelProperty("商户ID")
     private Integer merchantId;
 
-    /**
-     * 名称
-     */
+    @ApiModelProperty("名称")
     private String name;
 
-    /**
-     * 类型
-     * */
+    @ApiModelProperty("角色类型")
     private String type;
 
-    /**
-     * 备注
-     * */
+    @ApiModelProperty("备注")
     private String description;
 
-    /**
-     * 状态 : A 有效 D 无效
-     */
+    @ApiModelProperty("状态 : A有效 D无效")
     private String status;
 
-    public Long getId() {
-        return id;
-    }
-
-    public void setId(Long id) {
-        this.id = id;
-    }
-
-    public Integer getMerchantId() {
-        return merchantId;
-    }
-
-    public void setMerchantId(Integer merchantId) {
-        this.merchantId = merchantId;
-    }
-
-    public String getName() {
-        return name;
-    }
-
-    public void setName(String name) {
-        this.name = name;
-    }
-
-    public String getType() {
-        return type;
-    }
-
-    public void setType(String type) {
-        this.type = type;
-    }
-
-    public String getDescription() {
-        return description;
-    }
-
-    public void setDescription(String description) {
-        this.description = description;
-    }
-
-    public String getStatus() {
-        return status;
-    }
-
-    public void setStatus(String status) {
-        this.status = status;
-    }
 }

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

@@ -1,107 +1,47 @@
 package com.fuint.common.dto;
 
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Getter;
+import lombok.Setter;
+
 import java.io.Serializable;
 import java.util.Date;
 
+/**
+ * 短信模板实体类
+ *
+ * Created by FSQ
+ * CopyRight https://www.fuint.cn
+ */
+@Getter
+@Setter
 public class SmsTemplateDto implements Serializable {
 
-    private static final long serialVersionUID = 1L;
-
-    /**
-     * 自增ID
-     */
+    @ApiModelProperty("自增ID")
     private Integer id;
 
-    /**
-     * 商户ID
-     */
+    @ApiModelProperty("商户ID")
     private Integer merchantId;
 
-    /**
-     * 模板名称
-     */
+    @ApiModelProperty("模板名称")
     private String name;
 
-    /**
-     * 模板英文名称
-     */
+    @ApiModelProperty("模板英文名称")
     private String uname;
 
-    /**
-     * 模板code
-     */
+    @ApiModelProperty("模板编码")
     private String code;
 
-    /**
-     * 内容
-     */
+    @ApiModelProperty("模板内容")
     private String content;
 
-    /**
-     * 创建时间
-     */
+    @ApiModelProperty("创建时间")
     private Date createTime;
-    /**
-     * 更新时间
-     */
+
+    @ApiModelProperty("更新时间")
     private Date updateTime;
-    /**
-     * 状态，1：正常；2：删除
-     */
+
+    @ApiModelProperty("状态，1：正常；2：删除")
     private String status;
 
-    public Integer getId(){
-        return id;
-    }
-    public void setId(Integer id){
-        this.id=id;
-    }
-    public Integer getMerchantId(){
-        return merchantId;
-    }
-    public void setMerchantId(Integer merchantId){
-        this.merchantId=merchantId;
-    }
-    public String getName(){
-        return name;
-    }
-    public void setName(String name){
-        this.name=name;
-    }
-    public String getUname(){
-        return uname;
-    }
-    public void setUname(String uname){
-        this.uname=uname;
-    }
-    public String getCode(){
-        return code;
-    }
-    public void setCode(String code){
-        this.code=code;
-    }
-    public String getContent(){
-        return content;
-    }
-    public void setContent(String content){
-        this.content=content;
-    }
-    public Date getCreateTime(){
-        return createTime;
-    }
-    public void setCreateTime(Date createTime){
-        this.createTime=createTime;
-    }
-    public Date getUpdateTime(){
-        return updateTime;
-    }
-    public void setUpdateTime(Date updateTime){
-        this.updateTime=updateTime;
-    }
-    public String getStatus(){
-        return status;
-    }
-    public void setStatus(String status){
-        this.status=status;
-    }
 }

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

@@ -1,231 +1,69 @@
 package com.fuint.common.dto;
 
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Getter;
+import lombok.Setter;
+import java.io.Serializable;
+
 /**
  * 菜单信息实体
  *
  * Created by FSQ
  * CopyRight https://www.fuint.cn
  */
-public class SourceDto {
+@Getter
+@Setter
+public class SourceDto implements Serializable {
 
-    /**
-     * 菜单ID
-     */
+    @ApiModelProperty("自增ID")
     private long id;
 
-    /**
-     * 商户ID
-     */
+    @ApiModelProperty("商户ID")
     private Integer merchantId;
 
-    /**
-     * 菜单名称
-     */
+    @ApiModelProperty("菜单名称")
     private String name;
 
-    /**
-     * 菜单名称(字母)
-     */
+    @ApiModelProperty("菜单名称(字母)")
     private String ename;
 
-    /**
-     * tree 节点是否打开
-     */
-    private boolean open;
+    @ApiModelProperty("节点是否打开")
+    private Boolean open;
 
-    /**
-     * 是否菜单
-     * */
+    @ApiModelProperty("是否菜单")
     private int isMenu;
 
-    /**
-     * tree 节点是否选中
-     */
-    private boolean checked;
+    @ApiModelProperty("节点是否选中")
+    private Boolean checked;
 
-    /**
-     * url
-     */
+    @ApiModelProperty("url")
     private String url;
 
-    /**
-     * path
-     */
+    @ApiModelProperty("路径")
     private String path;
 
-    /**
-     * 权限标识
-     */
+    @ApiModelProperty("权限标识")
     private String perms;
 
-    /**
-     * 菜单级别
-     */
+    @ApiModelProperty("菜单级别")
     private int level;
 
-    /**
-     * 上级菜单
-     */
+    @ApiModelProperty("上级菜单")
     private long parentId;
 
-    /**
-     * 图标
-     */
+    @ApiModelProperty("图标")
     private String icon;
 
-    /**
-     * 新图标
-     */
+    @ApiModelProperty("新图标")
     private String newIcon;
 
-    /**
-     * 描述信息
-     * */
+    @ApiModelProperty("描述信息")
     private String description;
 
-    /**
-     * 排序
-     * */
+    @ApiModelProperty("排序")
     private String sort;
 
-    /**
-     * 状态
-     * */
+    @ApiModelProperty("状态")
     private String status;
 
-    public long getId() {
-        return id;
-    }
-
-    public void setId(long id) {
-        this.id = id;
-    }
-
-    public Integer getMerchantId() {
-        return merchantId;
-    }
-
-    public void setMerchantId(Integer merchantId) {
-        this.merchantId = merchantId;
-    }
-
-    public String getName() {
-        return name;
-    }
-
-    public void setName(String name) {
-        this.name = name;
-    }
-
-    public String getEname() {
-        return ename;
-    }
-
-    public void setEname(String ename) {
-        this.ename = ename;
-    }
-
-    public boolean isOpen() {
-        return open;
-    }
-
-    public int getIsMenu() {
-        return isMenu;
-    }
-
-    public void setIsMenu(int isMenu) {
-        this.isMenu = isMenu;
-    }
-
-    public void setOpen(boolean open) {
-        this.open = open;
-    }
-
-    public boolean isChecked() {
-        return checked;
-    }
-
-    public void setChecked(boolean checked) {
-        this.checked = checked;
-    }
-
-    public int getLevel() {
-        return level;
-    }
-
-    public void setLevel(int level) {
-        this.level = level;
-    }
-
-    public long getParentId() {
-        return parentId;
-    }
-
-    public void setParentId(long parentId) {
-        this.parentId = parentId;
-    }
-
-    public String getUrl() {
-        return url;
-    }
-
-    public void setUrl(String url) {
-        this.url = url;
-    }
-
-    public String getPath() {
-        return path;
-    }
-
-    public void setPath(String path) {
-        this.path = path;
-    }
-
-    public String getPerms() {
-        return perms;
-    }
-
-    public void setPerms(String perms) {
-        this.perms = perms;
-    }
-
-    public String getIcon() {
-        return icon;
-    }
-
-    public void setIcon(String icon) {
-        this.icon = icon;
-    }
-
-    public String getNewIcon() {
-        return newIcon;
-    }
-
-    public void setNewIcon(String newIcon) {
-        this.newIcon = newIcon;
-    }
-
-    public String getDescription() {
-        return description;
-    }
-
-    public void setDescription(String description) {
-        this.description = description;
-    }
-
-    public String getSort() {
-        return sort;
-    }
-
-    public void setSort(String sort) {
-        this.sort = sort;
-    }
-
-    public String getStatus() {
-        return status;
-    }
-
-    public void setStatus(String status) {
-        this.status = status;
-    }
 }

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

@@ -1,310 +1,100 @@
 package com.fuint.common.dto;
 
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Getter;
+import lombok.Setter;
 import java.io.Serializable;
 import java.util.Date;
 
 /**
  * 店铺实体
+ *
+ * Created by FSQ
+ * CopyRight https://www.fuint.cn
  * */
+@Getter
+@Setter
 public class StoreDto implements Serializable {
 
-    private static final long serialVersionUID = 1L;
-
-    /**
-     * 自增ID
-     */
+    @ApiModelProperty("自增ID")
     private Integer id;
 
-    /**
-     * 所属商户ID
-     * */
+    @ApiModelProperty("商户ID")
     private Integer merchantId;
 
-    /**
-     * 所属商户名称
-     * */
+    @ApiModelProperty("商户名称")
     private String merchantName;
 
-    /**
-     * 店铺名称
-     */
+    @ApiModelProperty("店铺名称")
     private String name;
 
-    /**
-     * 店铺LOGO
-     * */
+    @ApiModelProperty("店铺LOGO")
     private String logo;
 
-    /**
-     * 是否默认店铺
-     */
+    @ApiModelProperty("是否默认店铺")
     private String isDefault;
 
-    /**
-     * 联系人姓名
-     */
+    @ApiModelProperty("联系人")
     private String contact;
 
-    /**
-     * 联系电话
-     */
+    @ApiModelProperty("联系电话")
     private String phone;
 
-    /**
-     * 店铺地址
-     */
+    @ApiModelProperty("店铺地址")
     private String address;
 
-    /**
-     * 营业时间
-     */
+    @ApiModelProperty("营业时间")
     private String hours;
 
-    /**
-     * 经度
-     */
+    @ApiModelProperty("经度")
     private String latitude;
 
-    /**
-     * 纬度
-     */
+    @ApiModelProperty("纬度")
     private String longitude;
 
-    /**
-     * 备注信息
-     */
+    @ApiModelProperty("备注信息")
     private String description;
 
-    /**
-     * 微信商户号
-     */
+    @ApiModelProperty("微信商户号")
     private String wxMchId;
 
-    /**
-     * 微信支付秘钥
-     */
+    @ApiModelProperty("微信支付秘钥")
     private String wxApiV2;
 
-    /**
-     * 支付宝appId
-     * */
+    @ApiModelProperty("支付宝appId")
     private String alipayAppId;
 
-    /**
-     * 支付宝应用私钥
-     * */
+    @ApiModelProperty("支付宝应用私钥")
     private String alipayPrivateKey;
 
-    /**
-     * 支付宝支付公钥
-     * */
+    @ApiModelProperty("支付宝支付公钥")
     private String alipayPublicKey;
 
-    /**
-     * 营业执照
-     * */
+    @ApiModelProperty("营业执照")
     private String license;
 
-    /**
-     * 统一社会信用代码
-     * */
+    @ApiModelProperty("统一社会信用代码")
     private String creditCode;
 
-    /**
-     * 银行名称
-     * */
+    @ApiModelProperty("银行名称")
     private String bankName;
 
-    /**
-     * 银行卡账户名
-     * */
+    @ApiModelProperty("银行卡账户名")
     private String bankCardName;
 
-    /**
-     * 银行卡卡号
-     * */
+    @ApiModelProperty("银行卡卡号")
     private String bankCardNo;
 
-    /**
-     * 创建时间
-     */
+    @ApiModelProperty("创建时间")
     private Date createTime;
 
-    /**
-     * 更新时间
-     */
+    @ApiModelProperty("更新时间")
     private Date updateTime;
 
-    /**
-     * 状态，1：正常；2：删除
-     */
+    @ApiModelProperty("状态，1：正常；2：删除")
     private String status;
 
-    /**
-     * 最后操作人
-     */
+    @ApiModelProperty("最后操作人")
     private String operator;
 
-    public Integer getId(){
-        return id;
-    }
-    public void setId(Integer id){
-        this.id=id;
-    }
-    public Integer getMerchantId(){
-        return merchantId;
-    }
-    public void setMerchantId(Integer merchantId){
-        this.merchantId=merchantId;
-    }
-    public String getMerchantName(){
-        return merchantName;
-    }
-    public void setMerchantName(String merchantName){
-        this.merchantName=merchantName;
-    }
-    public String getName(){
-        return name;
-    }
-    public void setName(String name){
-        this.name=name;
-    }
-    public String getLogo(){
-        return logo;
-    }
-    public void setLogo(String logo){
-        this.logo=logo;
-    }
-    public String getIsDefault(){
-        return isDefault;
-    }
-    public void setIsDefault(String isDefault){
-        this.isDefault=isDefault;
-    }
-    public String getContact(){
-        return contact;
-    }
-    public void setContact(String contact){
-        this.contact=contact;
-    }
-    public String getPhone(){
-        return phone;
-    }
-    public void setPhone(String phone){
-        this.phone=phone;
-    }
-    public String getAddress(){
-        return address;
-    }
-    public void setAddress(String address){
-        this.address=address;
-    }
-    public String getHours(){
-        return hours;
-    }
-    public void setHours(String hours){
-        this.hours=hours;
-    }
-    public String getLatitude(){
-        return latitude;
-    }
-    public void setLatitude(String latitude){
-        this.latitude=latitude;
-    }
-    public String getLongitude(){
-        return longitude;
-    }
-    public void setLongitude(String longitude){
-        this.longitude=longitude;
-    }
-    public String getDescription(){
-        return description;
-    }
-    public void setDescription(String description){
-        this.description=description;
-    }
-    public String getWxMchId(){
-        return wxMchId;
-    }
-    public void setWxMchId(String wxMchId){
-        this.wxMchId=wxMchId;
-    }
-    public String getWxApiV2(){
-        return wxApiV2;
-    }
-    public void setWxApiV2(String wxApiV2){
-        this.wxApiV2=wxApiV2;
-    }
-    public String getAlipayAppId(){
-        return alipayAppId;
-    }
-    public void setAlipayAppId(String alipayAppId){
-        this.alipayAppId=alipayAppId;
-    }
-    public String getAlipayPrivateKey(){
-        return alipayPrivateKey;
-    }
-    public void setAlipayPrivateKey(String alipayPrivateKey){
-        this.alipayPrivateKey=alipayPrivateKey;
-    }
-    public String getAlipayPublicKey(){
-        return alipayPublicKey;
-    }
-    public void setAlipayPublicKey(String alipayPublicKey){
-        this.alipayPublicKey=alipayPublicKey;
-    }
-    public String getLicense(){
-        return license;
-    }
-    public void setLicense(String license){
-        this.license=license;
-    }
-    public String getCreditCode(){
-        return creditCode;
-    }
-    public void setCreditCode(String creditCode){
-        this.creditCode=creditCode;
-    }
-    public String getBankName(){
-        return bankName;
-    }
-    public void setBankName(String bankName){
-        this.bankName=bankName;
-    }
-    public String getBankCardName(){
-        return bankCardName;
-    }
-    public void setBankCardName(String bankCardName){
-        this.bankCardName=bankCardName;
-    }
-    public String getBankCardNo(){
-        return bankCardNo;
-    }
-    public void setBankCardNo(String bankCardNo){
-        this.bankCardNo=bankCardNo;
-    }
-    public Date getCreateTime(){
-        return createTime;
-    }
-    public void setCreateTime(Date createTime){
-        this.createTime=createTime;
-    }
-    public Date getUpdateTime(){
-        return updateTime;
-    }
-    public void setUpdateTime(Date updateTime){
-        this.updateTime=updateTime;
-    }
-    public String getStatus(){
-        return status;
-    }
-    public void setStatus(String status){
-        this.status=status;
-    }
-    public String getOperator(){
-        return operator;
-    }
-    public void setOperator(String operator){
-        this.operator=operator;
-    }
 }

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

@@ -1,5 +1,10 @@
 package com.fuint.common.dto;
 
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Getter;
+import lombok.Setter;
+
+import java.io.Serializable;
 import java.util.List;
 
 /**
@@ -8,61 +13,28 @@ import java.util.List;
  * Created by FSQ
  * CopyRight https://www.fuint.cn
  */
-public class SubMessageDto {
-    private String key;
-    private String templateId;
-    private String tid;
-    private String title;
-    private String content;
-    private String status;
-    private List<ParamDto> params;
+@Getter
+@Setter
+public class SubMessageDto implements Serializable {
 
-    public String getKey(){
-        return key;
-    }
-    public void setKey(String key){
-        this.key = key;
-    }
+    @ApiModelProperty("键值")
+    private String key;
 
-    public String getTemplateId(){
-        return templateId;
-    }
-    public void setTemplateId(String templateId){
-        this.templateId = templateId;
-    }
+    @ApiModelProperty("模板ID")
+    private String templateId;
 
-    public String getTid(){
-        return tid;
-    }
-    public void setTid(String tid){
-        this.tid = tid;
-    }
+    @ApiModelProperty("TID")
+    private String tid;
 
-    public String getTitle(){
-        return title;
-    }
-    public void setTitle(String title){
-        this.title = title;
-    }
+    @ApiModelProperty("标题")
+    private String title;
 
-    public String getContent(){
-        return content;
-    }
-    public void setContent(String content){
-        this.content = content;
-    }
+    @ApiModelProperty("内容")
+    private String content;
 
-    public String getStatus(){
-        return status;
-    }
-    public void setStatus(String status){
-        this.status = status;
-    }
+    @ApiModelProperty("状态")
+    private String status;
 
-    public List<ParamDto> getParams(){
-        return params;
-    }
-    public void setParams(List<ParamDto> params){
-        this.params = params;
-    }
+    @ApiModelProperty("模板参数")
+    private List<ParamDto> params;
 }

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

@@ -1,46 +1,30 @@
 package com.fuint.common.dto;
 
-public class TokenDto {
-
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Getter;
+import lombok.Setter;
+
+import java.io.Serializable;
+
+/**
+ * 登录Token实体
+ *
+ * Created by FSQ
+ * CopyRight https://www.fuint.cn
+ */
+@Getter
+@Setter
+public class TokenDto implements Serializable {
+
+    @ApiModelProperty("token")
     private String token;
 
-    //token创建时间
+    @ApiModelProperty("创建时间")
     private Long tokenCreatedTime;
 
-    //失效时间
+    @ApiModelProperty("失效时间")
     private Long tokenExpiryTime;
-    //是否登录 true or false
-    private String isLogin;
-
-    public String getToken() {
-        return token;
-    }
-
-    public void setToken(String token) {
-        this.token = token;
-    }
-
-    public Long getTokenCreatedTime() {
-        return tokenCreatedTime;
-    }
 
-    public void setTokenCreatedTime(Long tokenCreatedTime) {
-        this.tokenCreatedTime = tokenCreatedTime;
-    }
-
-    public Long getTokenExpiryTime() {
-        return tokenExpiryTime;
-    }
-
-    public void setTokenExpiryTime(Long tokenExpiryTime) {
-        this.tokenExpiryTime = tokenExpiryTime;
-    }
-
-    public String getIsLogin() {
-        return isLogin;
-    }
-
-    public void setIsLogin(String isLogin) {
-        this.isLogin = isLogin;
-    }
+    @ApiModelProperty("是否登录")
+    private String isLogin;
 }

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

@@ -1,6 +1,10 @@
 package com.fuint.common.dto;
 
 import com.fuint.repository.model.MtConfirmLog;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Getter;
+import lombok.Setter;
+
 import java.io.Serializable;
 import java.math.BigDecimal;
 import java.util.List;
@@ -11,221 +15,62 @@ import java.util.List;
  * Created by FSQ
  * CopyRight https://www.fuint.cn
  */
+@Getter
+@Setter
 public class UserCouponDto implements Serializable {
 
-    /**
-     * 自增ID
-     * */
+    @ApiModelProperty("自增ID")
     private Integer id;
 
-    /**
-     * 卡券名称
-     * */
+    @ApiModelProperty("卡券名称")
     private String name;
 
-    /**
-     * 卡券类型
-     * */
+    @ApiModelProperty("卡券类型")
     private String type;
 
-    /**
-     * 状态
-     * */
+    @ApiModelProperty("状态")
     private String status;
 
-    /**
-     * 券ID
-     * */
+    @ApiModelProperty("卡券ID")
     private Integer couponId;
 
-    /**
-     * 使用规则
-     * */
+    @ApiModelProperty("使用规则")
     private String useRule;
 
-    /**
-     * 核销编码
-     * */
+    @ApiModelProperty("核销编码")
     private String code;
 
-    /**
-     * 二维码
-     * */
+    @ApiModelProperty("二维码")
     private String qrCode;
 
-    /**
-     * 图片
-     * */
+    @ApiModelProperty("图片")
     private String image;
 
-    /**
-     * 面额
-     * */
+    @ApiModelProperty("面额")
     private BigDecimal amount;
 
-    /**
-     * 是否允许转赠
-     * */
-    private boolean isGive;
+    @ApiModelProperty("是否允许转赠")
+    private Boolean isGive;
 
-    /**
-     * 余额
-     * */
+    @ApiModelProperty("余额")
     private BigDecimal balance;
 
-    /**
-     * 核销次数
-     * */
+    @ApiModelProperty("核销次数")
     private Integer confirmCount;
 
-    /**
-     * 核销记录
-     * */
+    @ApiModelProperty("核销记录")
     private List<MtConfirmLog> confirmLogs;
 
-    /**
-     * 是否可以使用(过期、状态等)
-     * */
+    @ApiModelProperty("是否可用(过期、状态等)")
     private boolean canUse;
 
-    /**
-     * 有效期
-     * */
+    @ApiModelProperty("有效期")
     private String effectiveDate;
 
-    /**
-     * 小提示
-     * */
+    @ApiModelProperty("提示信息")
     private String tips;
 
-    /**
-     * 描述信息
-     * */
+    @ApiModelProperty("描述信息")
     private String description;
 
-    public Integer getId() {
-        return id;
-    }
-    public void setId(Integer id) {
-        this.id = id;
-    }
-
-    public String getName() {
-        return name;
-    }
-    public void setName(String name) {
-        this.name = name;
-    }
-
-    public String getType() {
-        return type;
-    }
-    public void setType(String type) {
-        this.type = type;
-    }
-
-    public String getStatus() {
-        return status;
-    }
-    public void setStatus(String status) {
-        this.status = status;
-    }
-
-    public Integer getCouponId() {
-        return couponId;
-    }
-    public void setCouponId(Integer couponId) {
-        this.couponId = couponId;
-    }
-
-    public String getUseRule() {
-        return useRule;
-    }
-    public void setUseRule(String useRule) {
-        this.useRule = useRule;
-    }
-
-    public String getCode() {
-        return code;
-    }
-    public void setCode(String code) {
-        this.code = code;
-    }
-
-    public String getQrCode() {
-        return qrCode;
-    }
-    public void setQrCode(String qrCode) {
-        this.qrCode = qrCode;
-    }
-
-    public String getImage() {
-        return image;
-    }
-    public void setImage(String image) {
-        this.image = image;
-    }
-
-    public BigDecimal getAmount() {
-        return amount;
-    }
-    public void setAmount(BigDecimal amount) {
-        this.amount = amount;
-    }
-
-    public Boolean getIsGive() {
-        return isGive;
-    }
-    public void setIsGive(Boolean isGive) {
-        this.isGive = isGive;
-    }
-
-    public BigDecimal getBalance() {
-        return balance;
-    }
-    public void setBalance(BigDecimal balance) {
-        this.balance = balance;
-    }
-
-    public Integer getConfirmCount() {
-        return confirmCount;
-    }
-    public void setConfirmCount(Integer confirmCount) {
-        this.confirmCount = confirmCount;
-    }
-
-    public List<MtConfirmLog> getConfirmLogs() {
-        return confirmLogs;
-    }
-    public void setConfirmLogs(List<MtConfirmLog> confirmLogs) {
-        this.confirmLogs = confirmLogs;
-    }
-
-    public boolean getCanUse() {
-        return canUse;
-    }
-    public void setCanUse(boolean canUse) {
-        this.canUse = canUse;
-    }
-
-    public String getEffectiveDate() {
-        return effectiveDate;
-    }
-    public void setEffectiveDate(String effectiveDate) {
-        this.effectiveDate = effectiveDate;
-    }
-
-    public String getTips() {
-        return tips;
-    }
-    public void setTips(String tips) {
-        this.tips = tips;
-    }
-
-    public String getDescription() {
-        return description;
-    }
-    public void setDescription(String description) {
-        this.description = description;
-    }
 }

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

@@ -19,8 +19,6 @@ import lombok.Setter;
 @Setter
 public class UserDto implements Serializable {
 
-    private static final long serialVersionUID = 1L;
-
     @ApiModelProperty("会员ID")
     private Integer id;
 
@@ -106,4 +104,5 @@ public class UserDto implements Serializable {
 
     @ApiModelProperty("最后操作人")
     private String operator;
+
 }

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

@@ -17,8 +17,6 @@ import lombok.Setter;
 @Setter
 public class UserGroupDto implements Serializable {
 
-    private static final long serialVersionUID = 1L;
-
     @ApiModelProperty("分组ID")
     private Integer id;
 
@@ -51,4 +49,5 @@ public class UserGroupDto implements Serializable {
 
     @ApiModelProperty("最后操作人")
     private String operator;
+
 }

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

@@ -1,5 +1,6 @@
 package com.fuint.common.dto;
 
+import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import java.io.Serializable;
 
@@ -11,6 +12,11 @@ import java.io.Serializable;
  */
 @Data
 public class UserInfo implements Serializable {
+
+    @ApiModelProperty("会员ID")
     private Integer id;
+
+    @ApiModelProperty("登录Token")
     private String token;
+
 }

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

@@ -2,6 +2,10 @@ package com.fuint.common.dto;
 
 import com.fuint.repository.model.MtRefund;
 import com.fuint.repository.model.MtStore;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Getter;
+import lombok.Setter;
+
 import java.io.Serializable;
 import java.math.BigDecimal;
 import java.util.List;
@@ -12,461 +16,114 @@ import java.util.List;
  * Created by FSQ
  * CopyRight https://www.fuint.cn
  */
+@Getter
+@Setter
 public class UserOrderDto implements Serializable {
 
-    /**
-     * 自增ID
-     */
+    @ApiModelProperty("自增ID")
     private Integer id;
 
-    /**
-     * 商户ID
-     */
+    @ApiModelProperty("商户ID")
     private Integer merchantId;
 
-    /**
-     * 订单号
-     */
+    @ApiModelProperty("订单号")
     private String orderSn;
 
-    /**
-     * 类型
-     */
+    @ApiModelProperty("订单类型")
     private String type;
 
-    /**
-     * 类型名称
-     */
+    @ApiModelProperty("订单类型名称")
     private String typeName;
 
-    /**
-     * 支付类型
-     * */
+    @ApiModelProperty("支付类型")
     private String payType;
 
-    /**
-     * 订单模式
-     */
+    @ApiModelProperty("订单模式")
     private String orderMode;
 
-    /**
-     * 是否核销
-     * */
-    private boolean isVerify;
+    @ApiModelProperty("是否核销")
+    private Boolean isVerify;
 
-    /**
-     * 卡券ID
-     */
+    @ApiModelProperty("卡券ID")
     private Integer couponId;
 
-    /**
-     * 会员ID
-     */
+    @ApiModelProperty("会员ID")
     private Integer userId;
 
-    /**
-     * 是否游客
-     */
+    @ApiModelProperty("是否游客")
     private String isVisitor;
 
-    /**
-     * 核销码
-     * */
+    @ApiModelProperty("核销码")
     private String verifyCode;
 
-    /**
-     * 员工ID
-     */
+    @ApiModelProperty("员工ID")
     private Integer staffId;
 
-    /**
-     * 总金额
-     */
+    @ApiModelProperty("总金额")
     private BigDecimal amount;
 
-    /**
-     * 支付金额
-     */
+    @ApiModelProperty("支付金额")
     private BigDecimal payAmount;
 
-    /**
-     * 优惠金额
-     */
+    @ApiModelProperty("优惠金额")
     private BigDecimal discount;
 
-    /**
-     * 配送费用
-     */
+    @ApiModelProperty("配送费用")
     private BigDecimal deliveryFee;
 
-    /**
-     * 使用积分
-     * */
+    @ApiModelProperty("使用积分")
     private Integer usePoint;
 
-    /**
-     * 积分金额
-     */
+    @ApiModelProperty("积分金额")
     private BigDecimal pointAmount;
 
-    /**
-     * 订单参数
-     */
+    @ApiModelProperty("订单参数")
     private String param;
 
-    /**
-     * 用户备注
-     */
+    @ApiModelProperty("备注信息")
     private String remark;
 
-    /**
-     * 创建时间
-     */
+    @ApiModelProperty("创建时间")
     private String createTime;
 
-    /**
-     * 更新时间
-     */
+    @ApiModelProperty("更新时间")
     private String updateTime;
 
-    /**
-     * 支付时间
-     */
+    @ApiModelProperty("支付时间")
     private String payTime;
 
-    /**
-     * 状态
-     */
+    @ApiModelProperty("订单状态")
     private String status;
 
-    /**
-     * 支付状态
-     */
+    @ApiModelProperty("支付状态")
     private String payStatus;
 
-    /**
-     * 状态
-     */
+    @ApiModelProperty("状态说明")
     private String statusText;
 
-    /**
-     * 最后操作人
-     */
+    @ApiModelProperty("最后操作人")
     private String operator;
 
-    /**
-     * 订单商品列表
-     */
+    @ApiModelProperty("订单商品列表")
     private List<OrderGoodsDto> goods;
 
-    /**
-     * 下单用户信息
-     */
+    @ApiModelProperty("下单用户信息")
     private OrderUserDto userInfo;
 
-    /**
-     * 配送地址
-     */
+    @ApiModelProperty("配送地址")
     private AddressDto address;
 
-    /**
-     * 物流信息
-     * */
+    @ApiModelProperty("物流信息")
     private ExpressDto expressInfo;
 
-    /**
-     * 所属店铺
-     */
+    @ApiModelProperty("所属店铺信息")
     private MtStore storeInfo;
 
-    /**
-     * 售后订单
-     * */
+    @ApiModelProperty("售后订单")
     private MtRefund refundInfo;
 
-    /**
-     * 使用卡券
-     * */
+    @ApiModelProperty("使用卡券")
     private UserCouponDto couponInfo;
 
-    public Integer getId() {
-        return id;
-    }
-
-    public void setId(Integer id) {
-        this.id = id;
-    }
-
-    public Integer getMerchantId() {
-        return merchantId;
-    }
-
-    public void setMerchantId(Integer merchantId) {
-        this.merchantId = merchantId;
-    }
-
-    public String getOrderSn() {
-        return orderSn;
-    }
-
-    public void setOrderSn(String orderSn) {
-        this.orderSn = orderSn;
-    }
-
-    public String getType() {
-        return type;
-    }
-
-    public void setType(String type) {
-        this.type = type;
-    }
-
-    public String getTypeName() {
-        return typeName;
-    }
-
-    public void setTypeName(String typeName) {
-        this.typeName = typeName;
-    }
-
-    public String getPayType() {
-        return payType;
-    }
-
-    public void setPayType(String payType) {
-        this.payType=payType;
-    }
-
-    public String getOrderMode() {
-        return orderMode;
-    }
-
-    public void setOrderMode(String orderMode) {
-        this.orderMode = orderMode;
-    }
-
-    public boolean getIsVerify() {
-        return isVerify;
-    }
-
-    public void setIsVerify(boolean isVerify) {
-        this.isVerify = isVerify;
-    }
-
-    public Integer getCouponId() {
-        return couponId;
-    }
-
-    public void setCouponId(Integer couponId) {
-        this.couponId = couponId;
-    }
-
-    public Integer getUserId() {
-        return userId;
-    }
-
-    public void setUserId(Integer userId) {
-        this.userId = userId;
-    }
-
-    public String getVerifyCode() {
-        return verifyCode;
-    }
-
-    public void setVerifyCode(String verifyCode) {
-        this.verifyCode = verifyCode;
-    }
-
-    public String getIsVisitor() {
-        return isVisitor;
-    }
-
-    public void setIsVisitor(String isVisitor) {
-        this.isVisitor = isVisitor;
-    }
-
-    public Integer getStaffId(){
-        return staffId;
-    }
-
-    public void setStaffId(Integer staffId){
-        this.staffId=staffId;
-    }
-
-    public BigDecimal getAmount() {
-        return amount;
-    }
-
-    public void setAmount(BigDecimal amount) {
-        this.amount = amount;
-    }
-
-    public BigDecimal getPayAmount() {
-        return payAmount;
-    }
-
-    public void setPayAmount(BigDecimal payAmount) {
-        this.payAmount = payAmount;
-    }
-
-    public BigDecimal getDiscount() {
-        return discount;
-    }
-
-    public void setDiscount(BigDecimal discount) {
-        this.discount = discount;
-    }
-
-    public BigDecimal getDeliveryFee() {
-        return deliveryFee;
-    }
-
-    public void setDeliveryFee(BigDecimal deliveryFee) {
-        this.deliveryFee = deliveryFee;
-    }
-
-    public Integer getUsePoint() {
-        return usePoint;
-    }
-
-    public void setUsePoint(Integer usePoint) {
-        this.usePoint = usePoint;
-    }
-
-    public BigDecimal getPointAmount() {
-        return pointAmount;
-    }
-
-    public void setPointAmount(BigDecimal pointAmount) {
-        this.pointAmount = pointAmount;
-    }
-
-    public String getParam() {
-        return param;
-    }
-
-    public void setParam(String param) {
-        this.param = param;
-    }
-
-    public String getRemark() {
-        return remark;
-    }
-
-    public void setRemark(String remark) {
-        this.remark = remark;
-    }
-
-    public String getCreateTime() {
-        return createTime;
-    }
-
-    public void setCreateTime(String createTime) {
-        this.createTime = createTime;
-    }
-
-    public String getUpdateTime() {
-        return updateTime;
-    }
-
-    public void setUpdateTime(String updateTime) {
-        this.updateTime = updateTime;
-    }
-
-    public String getStatus() {
-        return status;
-    }
-
-    public void setStatus(String status) {
-        this.status = status;
-    }
-
-    public String getStatusText() {
-        return statusText;
-    }
-
-    public void setStatusText(String statusText) {
-        this.statusText = statusText;
-    }
-
-    public String getPayStatus() {
-        return payStatus;
-    }
-
-    public void setPayStatus(String payStatus) {
-        this.payStatus = payStatus;
-    }
-
-    public String getPayTime() {
-        return payTime;
-    }
-
-    public void setPayTime(String payTime) {
-        this.payTime = payTime;
-    }
-
-    public String getOperator() {
-        return operator;
-    }
-
-    public void setOperator(String operator) {
-        this.operator = operator;
-    }
-
-    public List<OrderGoodsDto> getGoods() {
-        return goods;
-    }
-
-    public void setGoods(List<OrderGoodsDto> goods) {
-        this.goods = goods;
-    }
-
-    public OrderUserDto getUserInfo() {
-        return userInfo;
-    }
-
-    public void setUserInfo(OrderUserDto userInfo) {
-        this.userInfo = userInfo;
-    }
-
-    public AddressDto getAddress() {
-        return address;
-    }
-
-    public void setAddress(AddressDto address) {
-        this.address = address;
-    }
-
-    public ExpressDto getExpressInfo() {
-        return expressInfo;
-    }
-
-    public void setExpressInfo(ExpressDto expressInfo) {
-        this.expressInfo = expressInfo;
-    }
-
-    public MtStore getStoreInfo() {
-        return storeInfo;
-    }
-
-    public void setStoreInfo(MtStore storeInfo) {
-        this.storeInfo = storeInfo;
-    }
-
-    public MtRefund getRefundInfo() {
-        return refundInfo;
-    }
-
-    public void setRefundInfo(MtRefund refundInfo) {
-        this.refundInfo = refundInfo;
-    }
-
-    public UserCouponDto getCouponInfo() {
-        return couponInfo;
-    }
-
-    public void setCouponInfo(UserCouponDto couponInfo) {
-        this.couponInfo = couponInfo;
-    }
 }
 

fuint-application/src/main/java/com/fuint/common/service/SendLogService.java

@@ -26,7 +26,7 @@ public interface SendLogService extends IService<MtSendLog> {
     /**
      * 添加记录
      *
-     * @param reqSendLogDto
+     * @param  reqSendLogDto
      * @throws BusinessCheckException
      */
     MtSendLog addSendLog(ReqSendLogDto reqSendLogDto) throws BusinessCheckException;
@@ -34,7 +34,7 @@ public interface SendLogService extends IService<MtSendLog> {
     /**
      * 根据组ID获取发券记录
      *
-     * @param id ID
+     * @param  id ID
      * @throws BusinessCheckException
      */
     MtSendLog querySendLogById(Long id) throws BusinessCheckException;
@@ -42,8 +42,8 @@ public interface SendLogService extends IService<MtSendLog> {
     /**
      * 删除发券记录
      *
-     * @param id       ID
-     * @param operator 操作人
+     * @param  id       ID
+     * @param  operator 操作人
      * @throws BusinessCheckException
      */
     void deleteSendLog(Long id, String operator) throws BusinessCheckException;

fuint-application/src/main/java/com/fuint/common/service/impl/DutyServiceImpl.java

@@ -255,7 +255,7 @@ public class DutyServiceImpl extends ServiceImpl<TDutyMapper, TDuty> implements
                  sourceTreeNode.setName(tDuty.getDutyName());
                  sourceTreeNode.setId(tDuty.getDutyId());
                  sourceTreeNode.setLevel(1);
-                 sourceTreeNode.setpId(0);
+                 sourceTreeNode.setPId(0);
                  trees.add(sourceTreeNode);
             }
         }

fuint-application/src/main/java/com/fuint/common/service/impl/SourceServiceImpl.java

@@ -65,9 +65,9 @@ public class SourceServiceImpl extends ServiceImpl<TSourceMapper, TSource> imple
                 sourceTreeNode.setStatus(tSource.getStatus());
                 sourceTreeNode.setPerms(tSource.getPath().replaceAll("/", ":"));
                 if (tSource.getParentId() != null) {
-                    sourceTreeNode.setpId(tSource.getParentId());
+                    sourceTreeNode.setPId(tSource.getParentId());
                 } else {
-                    sourceTreeNode.setpId(0);
+                    sourceTreeNode.setPId(0);
                 }
                 trees.add(sourceTreeNode);
             }
@@ -172,7 +172,7 @@ public class SourceServiceImpl extends ServiceImpl<TSourceMapper, TSource> imple
         for (Iterator<TreeNode> iterator = menus.iterator(); iterator.hasNext();) {
             TreeNode menu = (TreeNode) iterator.next();
             // 如果是顶级节点, 遍历该父节点的所有子节点
-            if (!tempList.contains(menu.getpId())) {
+            if (!tempList.contains(menu.getPId())) {
                 recursionFn(menus, menu);
                 returnList.add(menu);
             }
@@ -252,7 +252,7 @@ public class SourceServiceImpl extends ServiceImpl<TSourceMapper, TSource> imple
         Iterator<TreeNode> it = list.iterator();
         while (it.hasNext()) {
             TreeNode n = it.next();
-            if (n.getpId() == t.getId()) {
+            if (n.getPId() == t.getId()) {
                 tList.add(n);
             }
         }

fuint-application/src/main/java/com/fuint/common/util/TreeUtil.java

@@ -28,7 +28,7 @@ public class TreeUtil {
         for (TreeNode node1 : sourceTreeNodeList) {
             boolean mark = false;
             for (TreeNode node2 : sourceTreeNodeList) {
-                if (StringUtil.isNotEmpty(node1.getName()) && node1.getpId() == node2.getId()) {
+                if (StringUtil.isNotEmpty(node1.getName()) && node1.getPId() == node2.getId()) {
                     mark = true;
                     if (node2.getChildrens() == null) {
                         node2.setChildrens(new ArrayList<>());

fuint-application/src/main/java/com/fuint/module/backendApi/controller/BackendLoginController.java

@@ -185,7 +185,7 @@ public class BackendLoginController extends BaseController {
             treeNode.setIsMenu(tSource.getIsMenu());
             treeNode.setSort((tSource.getSourceStyle() == null || StringUtil.isEmpty(tSource.getSourceStyle())) ? 0 : Integer.parseInt(tSource.getSourceStyle()));
             if (tSource.getParentId() != null) {
-                treeNode.setpId(tSource.getParentId());
+                treeNode.setPId(tSource.getParentId());
             }
             treeNode.setUrl(tSource.getSourceCode());
             treeNode.setIcon(tSource.getIcon());