Merge remote-tracking branch 'origin/master'

luodangjia

2024-11-04 e755145ce3a5d14468a09b4062c84d7c13a92f0c

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

@@ -51,6 +51,9 @@
    @ApiModelProperty(value = "签到得积分{\"num1\":1,\"num2\":[\"1(多少天),2（多少分）\"]}")
    @TableField("sign_in_for_points")
    private String signInForPoints;
    @ApiModelProperty(value = "是否双倍")
    @TableField(exist = false)
    private Integer isDouble;


}