Merge remote-tracking branch 'origin/master'

zhibing.pu

2024-08-20 e610cacda2b7431cf2161e0e39d37db3b2950bee

 ruoyi-api/ruoyi-api-other/src/main/java/com/ruoyi/other/api/domain/TIntegralRule.java

@@ -48,7 +48,7 @@
    @TableField("invite_users_to_earn_points")
    private String inviteUsersToEarnPoints;

    @ApiModelProperty(value = "签到得积分{\"num1\":1,\"num2\":[{\"num1\":1,\"num2\":1}]}")
    @ApiModelProperty(value = "签到得积分{\"num1\":1,\"num2\":[\"1(多少天),2（多少分）\"]}")
    @TableField("sign_in_for_points")
    private String signInForPoints;