创客额度相关,分享改bug，

pluss-model-bundle/src/main/java/cn/pluss/platform/entity/MerchantProfit.java

@@ -39,6 +39,9 @@ public class MerchantProfit {
     @TableId(value = "id", type = IdType.AUTO)
     private Long id;
     private Long userId;
+    /**
+     *类型   1   直推收入   2间推收入  3二级间推收入  4 升级收益   5   推广分润(多代理分润收入),6：V2.0分润模式 7: 缴费通8:音箱分润
+     */
     private String type;
     private Double price;
     private String orderNumber;

pluss-model-bundle/src/main/java/cn/pluss/platform/entity/UserAccount.java

@@ -1,5 +1,6 @@
 package cn.pluss.platform.entity;
 
+import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 import lombok.Data;
@@ -18,16 +19,16 @@ public class UserAccount implements Serializable {
 
 
 
-    @TableId
+    @TableField("user_id")
     private Integer userId;
-
+    @TableField("freeze_balance")
     private BigDecimal freezeBalance;
 
     private BigDecimal balance;
-
+    @TableField("out_balance")
     private BigDecimal outBalance;
-
+    @TableField("create_time")
     private Date createTime;
-
+    @TableField("update_time")
     private Date updateTime;
 }

pluss-model-bundle/src/main/java/cn/pluss/platform/entity/UserAccountFlow.java

@@ -1,6 +1,7 @@
 package cn.pluss.platform.entity;
 
 import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 import lombok.Data;
@@ -27,6 +28,8 @@ public class UserAccountFlow implements Serializable {
     private String bizName;
 
     private BigDecimal amount;
+    @TableField("order_amount")
+    private BigDecimal orderAmount;
 
     private BigDecimal balance;
 

pluss-model-bundle/src/main/java/cn/pluss/platform/entity/UserMakerFlow.java

@@ -0,0 +1,42 @@
+package cn.pluss.platform.entity;
+
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+import java.io.Serializable;
+import java.math.BigDecimal;
+import java.util.Date;
+
+/**
+ * @author lyf
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@TableName("tb_pluss_user_maker_flow")
+public class UserMakerFlow implements Serializable {
+    @TableId(value = "id", type = IdType.AUTO)
+    private Integer id;
+    @TableField("user_id")
+    private Integer userId;
+    @TableField("biz_code")
+    private String bizCode;
+    @TableField("biz_name")
+    private String bizName;
+    @TableField("amount")
+    private BigDecimal amount;
+    @TableField("balance")
+    private BigDecimal balance;
+    @TableField("remark")
+    private String remark;
+    @TableField("create_time")
+    private Date createTime;
+    @TableField("update_time")
+    private Date updateTime;
+}

pluss-model-bundle/src/main/java/cn/pluss/platform/entity/UserMakerQuota.java

@@ -0,0 +1,29 @@
+package cn.pluss.platform.entity;
+
+
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+import java.math.BigDecimal;
+import java.util.Date;
+
+/**
+ * @author lyf
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@TableName("tb_pluss_user_maker_quota")
+public class UserMakerQuota {
+    @TableField("id")
+    private Integer id;
+    @TableField("userId")
+    private Long userId;
+    @TableField("amount")
+    private BigDecimal amount;
+    @TableField("createTime")
+    private Date createTime;
+}

pluss-model-bundle/src/main/java/cn/pluss/platform/vo/UserMakerQuotaVO.java

@@ -0,0 +1,23 @@
+package cn.pluss.platform.vo;
+
+import com.baomidou.mybatisplus.annotation.TableField;
+import lombok.Data;
+
+import java.math.BigDecimal;
+import java.util.Date;
+
+/**
+ * @author lyf
+ */
+@Data
+public class UserMakerQuotaVO {
+    private Integer id;
+
+    private String userName;
+
+    private BigDecimal amount;
+
+    private BigDecimal lowerAmount;
+
+    private Date createTime;
+}