Merge remote-tracking branch 'origin/master'

puzhibing

2024-08-26 bbd76a30e69063e0baca98fb8c66e3e2e3703a52

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

@@ -24,7 +24,7 @@
@EqualsAndHashCode(callSuper = false)
@TableName("t_integral_rule")
@ApiModel(value="TIntegralRule对象", description="")
public class TIntegralRule extends BasePojo {
public class TIntegralRule {

    private static final long serialVersionUID = 1L;