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

Pu Zhibing

14 小时以前 2cf783a1480050c0f13907c5fde625edee8fce62

 ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/mapper/activity/ActivityMapper.java

@@ -4,7 +4,7 @@
import com.ruoyi.goods.domain.dto.MgtActivityPageDto;
import com.ruoyi.goods.domain.dto.MgtActivityRecordPageDto;
import com.ruoyi.goods.domain.dto.StaffActivityListDto;
import com.ruoyi.goods.domain.pojo.activity.Activity;
import com.ruoyi.system.api.domain.poji.activity.Activity;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.ruoyi.goods.domain.vo.*;
import com.ruoyi.system.api.domain.dto.AGStockChangeDto;