From 830e18bcfac0a9ac2c5c9e175affc4b9c1889a58 Mon Sep 17 00:00:00 2001
From: 刘小明 <liuxm_a@163.com>
Date: 星期四, 15 八月 2024 20:13:38 +0800
Subject: [PATCH] 测试git提交冲突问题
---
pms-parent/pms-global/src/main/resources/mapper/PrProductionProcessMapper.xml | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/pms-parent/pms-global/src/main/resources/mapper/PrProductionProcessMapper.xml b/pms-parent/pms-global/src/main/resources/mapper/PrProductionProcessMapper.xml
index 0386a6a..dc74c6d 100644
--- a/pms-parent/pms-global/src/main/resources/mapper/PrProductionProcessMapper.xml
+++ b/pms-parent/pms-global/src/main/resources/mapper/PrProductionProcessMapper.xml
@@ -156,7 +156,7 @@
<!-- </if>-->
</trim>
</select>
- <select id="queryAll" resultType="map">
+ <select id="queryAll" resultType="java.util.HashMap">
select
CAST(id AS CHAR) AS id,name
from pr_production_process
--
Gitblit v1.8.0