Merge remote-tracking branch 'origin/master'

puzhibing

2024-12-10 fb6eee80334ae23a2eca8c37baeef05e86c919ed

 ruoyi-api/ruoyi-api-account/src/main/java/com/ruoyi/account/api/model/AgentApplication.java

@@ -50,11 +50,11 @@

    @ApiModelProperty(value = "用户当前消费积分")
    @TableField("shop_point")
    private BigDecimal shopPoint;
    private Integer shopPoint;

    @ApiModelProperty(value = "用户当前分佣积分")
    @TableField("share_point")
    private BigDecimal sharePoint;
    private Integer sharePoint;

    @ApiModelProperty(value = "直推用户已达钻石会员数")
    @TableField("direct_vip_num")