Merge remote-tracking branch 'origin/master'

puzhibing

2024-11-11 ae84ae528290f44c66ef14c92f4a68bd3c1ce617

 ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/service/TIntegralRuleService.java

@@ -1,7 +1,7 @@
package com.ruoyi.other.service;

import com.ruoyi.other.model.TIntegralRule;
import com.baomidou.mybatisplus.extension.service.IService;
import com.ruoyi.other.api.domain.TIntegralRule;

/**
 * <p>