实体类添加

wisenergy-model/pom.xml

@@ -21,6 +21,12 @@
             <version>1.0.0-SNAPSHOT</version>
             <scope>compile</scope>
         </dependency>
+        <dependency>
+            <groupId>io.swagger</groupId>
+            <artifactId>swagger-annotations</artifactId>
+            <version>1.5.23</version>
+            <scope>compile</scope>
+        </dependency>
     </dependencies>
 
     <!-- MAVEN构建 -->

wisenergy-model/src/main/java/cn/wisenergy/model/app/PayRecord.java

@@ -7,69 +7,59 @@ import lombok.Data;
 import java.io.Serializable;
 import java.util.Date;
 
-/**
-*@ Description: 充值记录实体类
-*@ Author     : 86187
-*@ Date       : 2021/1/8 14:48
-*/
 @Data
 @ApiModel(value = "PayRecord")
 public class PayRecord implements Serializable {
-    private static final long serialVersionUID = -7865361068703566832L;
-
     /**
-     * 充值记录
+     * 充值记录id
      */
-    @ApiModelProperty(value = "",name = "")
+    @ApiModelProperty(value = "充值记录id",name = "id")
     private Integer id;
 
     /**
-     * 充值类型 1：支付宝 2：微信 3：充值卡
+     * 充值类型
      */
-    @ApiModelProperty(value = "",name = "")
+    @ApiModelProperty(value = "充值类型 1：支付宝 2：微信 3：充值卡",name = "type")
     private Integer type;
 
     /**
-     * 充值卡id
+     * 充值卡卡号
      */
-    @ApiModelProperty(value = "充值卡id",name = "cardId")
-    private String cardId;
+    @ApiModelProperty(value = "充值卡卡号",name = "cardCode")
+    private String cardCode;
 
     /**
-     * 充值用户id
+     * 充值用户
      */
-    @ApiModelProperty(value = "充值用户id",name = "userId")
-    private Integer userId;
+    @ApiModelProperty(value = "充值用户",name = "userId")
+    private Integer userId  ;
 
     /**
-     * 充值所花金额
+     * 充值金额
      */
-    @ApiModelProperty(value = "充值所花金额",name = "money")
+    @ApiModelProperty(value = "充值金额 ",name = "money")
     private String money;
 
     /**
-     * 充值结果 0：成功 1：失败
+     * 充值结果
      */
     @ApiModelProperty(value = "充值结果 0：成功 1：失败",name = "result")
     private Integer result;
-
     /**
-     * 充值获得次数
+     * 充值次数
      */
-    @ApiModelProperty(value = "",name = "")
+    @ApiModelProperty(value = "充值次数",name = "limit")
     private Integer limit;
 
     /**
      * 创建时间
      */
-    @ApiModelProperty(value = "创建时间",name = "createTime")
+    @ApiModelProperty(value = "创建时间",name = "creteTime")
     private Date createTime;
 
     /**
-     * 更行时间
+     *更改时间
      */
-    @ApiModelProperty(value = "更行时间",name = "updateTime")
+    @ApiModelProperty(value = "更改时间",name = "updateTime")
     private Date updateTime;
-
-
 }

wisenergy-model/src/main/java/cn/wisenergy/model/app/UserInfo.java

@@ -2,9 +2,11 @@ package cn.wisenergy.model.app;
 
 import cn.wisenergy.model.common.BaseEntity;
 import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
 import java.io.Serializable;
+import java.util.Date;
 
 /**
  * @author 86187
@@ -19,46 +21,76 @@ public class UserInfo extends BaseEntity implements Serializable {
     /**
      * 主键id
      */
+    @ApiModelProperty(name ="id",value = "用户主键id")
     private Integer id;
 
     /**
      * 用户名称
      */
+    @ApiModelProperty(name = "name",value = "用户名")
     private String userName;
 
     /**
      * 密码
      */
+    @ApiModelProperty(name="password",value = "用户密码")
     private String password;
 
     /**
      * 电话号码
      */
+    @ApiModelProperty(name = "phone",value = "手机号")
     private String phone;
 
-    /**
-     * 用户来源  1：移动端 2：pc端
-     */
-    private Integer source;
-
     /**
      * 头像
      */
+    @ApiModelProperty(name = "headImage",value = "头像")
     private String headImage;
 
     /**
      * 性别
      */
+    @ApiModelProperty(name = "sex",value = "用户性别:0:男，1：女")
     private Integer sex;
 
     /**
      * 学校
      */
+    @ApiModelProperty(name = "school", value = "毕业院校")
     private String school;
 
     /**
      * 学生类型
      */
+    @ApiModelProperty(name = "examType",value = "考生类型 1：文化课考生 2：美术生 3：体育生 4：文学编导考生")
     private Integer studentType;
 
+    /**
+     * 用户剩余查询次数
+     */
+    @ApiModelProperty(name = "queryLimit",value = "用户剩余查询次数")
+    private Integer queryLimit;
+
+    /**
+     * 用户充值总额
+     */
+    @ApiModelProperty(name = "moneyAmount",value = "充值总额")
+    private String moneyAmount;
+    /**
+     * 是否删除
+     */
+    @ApiModelProperty(name = "isDelete",value = "是否删除 0：正常 1：删除")
+    private Integer isDelete;
+    /**
+     * 创建时间
+     */
+    @ApiModelProperty(name = "createTime",value = "创建时间")
+    private Date createTime;
+    /**
+     * 修改时间
+     */
+    @ApiModelProperty(name = "updateTime",value = "修改时间")
+    private Date updateTime;
+
 }

wisenergy-model/src/main/java/cn/wisenergy/model/app/UserLimit.java

@@ -4,58 +4,50 @@ import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
-import java.io.Serializable;
 import java.util.Date;
 
-/**
- * @ Description: 用户查询次数实体类
- * @ Author     : 86187
- * @ Date       : 2021/1/8 17:39
- */
 @Data
 @ApiModel(value = "UserLimit")
-public class UserLimit implements Serializable {
-    private static final long serialVersionUID = -4567717561062839767L;
-
+public class UserLimit {
     /**
-     * 主键id
+     * 用户卡点id
      */
-    @ApiModelProperty(value = "主键id", name = "id")
+    @ApiModelProperty(value = "用户卡点id",name = "id")
     private Integer id;
 
     /**
      * 用户id
      */
-    @ApiModelProperty(value = "用户id", name = "userId")
+    @ApiModelProperty(value = "用户id",name = "userId")
     private Integer userId;
 
     /**
      * 总次数
      */
-    @ApiModelProperty(value = "总次数", name = "totalLimit")
+    @ApiModelProperty(value = "总次数",name = "totalLimit")
     private Integer totalLimit;
 
     /**
-     * 已使用次数
+     * 已使次数
      */
-    @ApiModelProperty(value = "已使用次数", name = "useLimit")
-    private Integer useLimit;
+    @ApiModelProperty(value = "已使次数",name = "useLimit")
+    private Integer useLimit  ;
 
     /**
-     * 可使用次数
+     * 可用次数
      */
-    @ApiModelProperty(value = "可使用次数", name = "usableLimit")
+    @ApiModelProperty(value = "可用次数",name = "usableLimit")
     private Integer usableLimit;
 
     /**
      * 创建时间
      */
-    @ApiModelProperty(value = "创建时间", name = "createTime")
+    @ApiModelProperty(value = "创建时间",name = "creteTime")
     private Date createTime;
 
     /**
-     * 更新时间
+     *更改时间
      */
-    @ApiModelProperty(value = "更新时间", name = "updateTime")
+    @ApiModelProperty(value = "更改时间",name = "updateTime")
     private Date updateTime;
 }

wisenergy-model/src/main/java/cn/wisenergy/model/app/UserVolunteer.java

@@ -4,39 +4,31 @@ import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
-import java.io.Serializable;
-
-/**
-*@ Description: 用户方案记录实体类
-*@ Author     : 86187
-*@ Date       : 2021/1/8 17:24
-*/
 @Data
 @ApiModel(value = "UserVolunteer")
-public class UserVolunteer implements Serializable {
-    private static final long serialVersionUID = -2103279712102307306L;
-
+public class UserVolunteer {
     /**
-     * id
+     * 用户方案id
      */
-    @ApiModelProperty(value = "id",name = "id")
+    @ApiModelProperty(value = "用户方案id",name = "id")
     private Integer id;
 
-    /**
-     * 方案记录id
-     */
-    @ApiModelProperty(value = "方案记录id",name = "schemeRecordId")
-    private Integer schemeRecordId;
-
     /**
      * 用户id
      */
     @ApiModelProperty(value = "用户id",name = "userId")
     private Integer userId;
 
+    /**
+     * 方案记录id
+     */
+    @ApiModelProperty(value = "方案记录id",name = "schemeRecordId")
+    private Integer schemeRecordId;
+
     /**
      * 志愿id
      */
     @ApiModelProperty(value = "志愿id",name = "volunteerId")
-    private Integer volunteerId;
+    private Integer volunteerId  ;
+
 }