From 464043930df178727b357e2b31b4e5f19e1e17a8 Mon Sep 17 00:00:00 2001
From: Fixiaobai <fixiaobai@163.com>
Date: 星期三, 30 八月 2023 10:13:27 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 inspection-server/src/main/resources/mapper/InspectionMapper.xml |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/inspection-server/src/main/resources/mapper/InspectionMapper.xml b/inspection-server/src/main/resources/mapper/InspectionMapper.xml
index 711a5fe..275f752 100644
--- a/inspection-server/src/main/resources/mapper/InspectionMapper.xml
+++ b/inspection-server/src/main/resources/mapper/InspectionMapper.xml
@@ -4,7 +4,7 @@
     <select id="selectInspectsList" resultType="map">
         select i.id,
         i.code icode,
-        type,
+        i.type type,
         DATE_FORMAT(`form_time`,'%Y-%m-%d'),
         supplier,
         im.code mcode,

--
Gitblit v1.9.3