From b2eaab4acba9cff12027caaa9203b81ece4cb5cc Mon Sep 17 00:00:00 2001 From: liujie <1793218484@qq.com> Date: 星期四, 09 十月 2025 15:19:51 +0800 Subject: [PATCH] Merge branch 'master' of http://120.76.84.145:10101/gitblit/r/java/haizhentong --- ruoyi-system/src/main/java/com/ruoyi/system/model/TCrmChangePoints.java | 16 ++++++++++++++-- 1 files changed, 14 insertions(+), 2 deletions(-) diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/model/TCrmChangePoints.java b/ruoyi-system/src/main/java/com/ruoyi/system/model/TCrmChangePoints.java index 845cdf4..8cf1b88 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/model/TCrmChangePoints.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/model/TCrmChangePoints.java @@ -29,11 +29,19 @@ @TableId(value = "id", type = IdType.ASSIGN_ID) private String id; - @ApiModelProperty(value = "分公司id、业务员id") + @ApiModelProperty(value = "分公司id、业务员id、诊所id") @TableField("branch_salesperson_id") private String branchSalespersonId; - @ApiModelProperty(value = "用户类型 1=分公司 2=业务员") + @ApiModelProperty(value = "采购id") + @TableField("procurement_id") + private String procurementId; + + @ApiModelProperty(value = "兑换id") + @TableField("exchange_id") + private String exchangeId; + + @ApiModelProperty(value = "用户类型 1=分公司 2=业务员 3=诊所") @TableField("user_type") private Integer userType; @@ -41,6 +49,10 @@ @TableField("change_type") private Integer changeType; + @ApiModelProperty(value = "变更原因 1=诊所采购 2=商城兑换 3=管理员修改") + @TableField("change_reason") + private Integer changeReason; + @ApiModelProperty(value = "变更数量") @TableField("change_value") private Integer changeValue; -- Gitblit v1.7.1