Merge remote-tracking branch 'origin/dev' into dev

xuhy

2 天以前 bd1e1c6a99c228ece8ece17be462b81d5494c7a1

 ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/service/impl/TIntegralRuleServiceImpl.java

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

import com.ruoyi.other.model.TIntegralRule;
import com.ruoyi.other.api.domain.TIntegralRule;
import com.ruoyi.other.mapper.TIntegralRuleMapper;
import com.ruoyi.other.service.TIntegralRuleService;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;