From a9f950c0d11a687a7a940443b8c765f6d87ae4f1 Mon Sep 17 00:00:00 2001
From: jyy <935090232@qq.com>
Date: Tue, 20 Apr 2021 00:26:22 +0800
Subject: [PATCH] 合并新的修改
---
zq-erp/src/main/java/com/matrix/system/score/dao/ScoreUseRecordDao.java | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/zq-erp/src/main/java/com/matrix/system/score/dao/ScoreUseRecordDao.java b/zq-erp/src/main/java/com/matrix/system/score/dao/ScoreUseRecordDao.java
index a2e4549..dae783a 100644
--- a/zq-erp/src/main/java/com/matrix/system/score/dao/ScoreUseRecordDao.java
+++ b/zq-erp/src/main/java/com/matrix/system/score/dao/ScoreUseRecordDao.java
@@ -5,7 +5,7 @@
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.matrix.system.score.entity.ScoreUseRecord;
import com.matrix.system.shopXcx.api.dto.ScoreFlowDto;
-import com.matrix.system.shopXcx.vo.SalesOrderVo;
+import com.matrix.system.shopXcx.api.vo.ScoreUseRecordVo;
import org.apache.ibatis.annotations.Param;
/**
@@ -21,5 +21,5 @@
* @param scoreFlowDto
* @return
*/
- IPage<ScoreUseRecord> selectFlowList(Page<SalesOrderVo> page, @Param("record")ScoreFlowDto scoreFlowDto);
+ IPage<ScoreUseRecordVo> selectFlowList(Page<ScoreUseRecordVo> page, @Param("record")ScoreFlowDto scoreFlowDto);
}
\ No newline at end of file
--
Gitblit v1.9.1