From dfacb4e315a49f2c0399574ef094c87b96e7e248 Mon Sep 17 00:00:00 2001
From: yaowanxin <3588231647@qq.com>
Date: 星期四, 24 七月 2025 09:30:51 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev_ywx_ztns' into dev_ywx_ztns
---
cnas-process/src/main/resources/mapper/ProcessDealMapper.xml | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/cnas-process/src/main/resources/mapper/ProcessDealMapper.xml b/cnas-process/src/main/resources/mapper/ProcessDealMapper.xml
index 282eaa7..037afa8 100644
--- a/cnas-process/src/main/resources/mapper/ProcessDealMapper.xml
+++ b/cnas-process/src/main/resources/mapper/ProcessDealMapper.xml
@@ -24,7 +24,7 @@
</if>
</select>
- <select id="selectDeal" resultType="com.ruoyi.process.pojo.ProcessDeal">
+ <select id="selectDeal" resultType="com.ruoyi.process.dto.ProcessDealDto">
select ROW_NUMBER() OVER (ORDER BY id) AS indexs,
id,
sample_name,
@@ -32,7 +32,7 @@
sample_supplier,
num,
deal_method,
- deal_time
+ DATE_FORMAT(deal_time, '%Y-%m-%d') dealTimeStr
from cnas_process_deal
where totaldeal_id = #{id}
</select>
--
Gitblit v1.9.3