Merge remote-tracking branch 'origin/dev/one' into debug

diagbotman-service/src/main/java/com/diagbot/entity/UserRenewals.java

@@ -64,7 +64,7 @@ public class UserRenewals implements Serializable {
     /**
      * 续费状态（1.已续费0.未续费）
      */
-    private Integer renewalsStutas;
+    private Integer renewalsStatus;
 
     /**
      * 申请时间
@@ -84,6 +84,19 @@ public class UserRenewals implements Serializable {
      */
     private String renewalsNo;
 
+    /**
+     * 是否取消续费
+     */
+    private Integer cancelRenewals;
+
+    public Integer getCancelRenewals() {
+        return cancelRenewals;
+    }
+
+    public void setCancelRenewals(Integer cancelRenewals) {
+        this.cancelRenewals = cancelRenewals;
+    }
+
     public Long getId() {
         return id;
     }
@@ -140,12 +153,12 @@ public class UserRenewals implements Serializable {
     public void setUserId(Long userId) {
         this.userId = userId;
     }
-    public Integer getRenewalsStutas() {
-        return renewalsStutas;
+    public Integer getRenewalsStatus() {
+        return renewalsStatus;
     }
 
-    public void setRenewalsStutas(Integer renewalsStutas) {
-        this.renewalsStutas = renewalsStutas;
+    public void setRenewalsStatus(Integer renewalsStatus) {
+        this.renewalsStatus = renewalsStatus;
     }
     public Date getApplyTime() {
         return applyTime;
@@ -166,7 +179,7 @@ public class UserRenewals implements Serializable {
         ", modifier=" + modifier +
         ", productId=" + productId +
         ", userId=" + userId +
-        ", renewalsStutas=" + renewalsStutas +
+        ", renewalsStatus=" + renewalsStatus +
         ", applyTime=" + applyTime +
         "}";
     }

diagbotman-service/src/main/java/com/diagbot/entity/wrapper/UserRenewalsWrapper.java

@@ -25,7 +25,7 @@ public class UserRenewalsWrapper {
     /**
      * 续费状态
      */
-    private Integer renewalsStutas;
+    private Integer renewalsStatus;
 
     /**
      * 机构名称
@@ -46,4 +46,9 @@ public class UserRenewalsWrapper {
      * 用户id
      */
     private List<Long> userId;
+
+    /**
+     * 是否取消续费
+     */
+    private Integer cancelRenewals;
 }