Merge remote-tracking branch 'origin/master'

puzhibing

2024-09-26 8b94c462ae127795cfa4a0495c723ca9b7041e10

 ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/mapper/TIntegralRuleMapper.java

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

import com.ruoyi.other.model.TIntegralRule;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.ruoyi.other.api.domain.TIntegralRule;

/**
 * <p>