From 43ce77a85d8297a53dc25430fff10ead57296167 Mon Sep 17 00:00:00 2001
From: jiazx0107@163.com <jiazx0107@163.com>
Date: 星期六, 04 十一月 2023 15:43:18 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 igds-inout/src/main/resources/mapper/InoutCheckMapper.xml |    2 ++
 1 files changed, 2 insertions(+), 0 deletions(-)

diff --git a/igds-inout/src/main/resources/mapper/InoutCheckMapper.xml b/igds-inout/src/main/resources/mapper/InoutCheckMapper.xml
index 29ed5d6..2bcd325 100644
--- a/igds-inout/src/main/resources/mapper/InoutCheckMapper.xml
+++ b/igds-inout/src/main/resources/mapper/InoutCheckMapper.xml
@@ -80,6 +80,7 @@
         CHECK_STATUS_ AS checkStatus,
         REMARKS_ AS remarks,
         FOOD_YEAR_ AS foodYear,
+        FOOD_TYPE_ AS foodType,
         IF(ISNULL(SAMPLE_TIME_),'NONE','SAMPLE') AS sampleStatus
         from
         D_INOUT_RECORD
@@ -115,6 +116,7 @@
             <if test="data.foodLevel != null">FOOD_LEVEL_ = #{data.foodLevel},</if>
             <if test="data.foodYear != null">FOOD_YEAR_ = #{data.foodYear},</if>
             <if test="data.foodVariety != null">FOOD_VARIETY_ = #{data.foodVariety},</if>
+            <if test="data.foodType != null">FOOD_Type_ = #{data.foodType},</if>
             <if test="data.deCheck != null">DE_CHECK_ = #{data.deCheck},</if>
             <if test="data.addCheck != null">ADD_CHECK_ = #{data.addCheck},</if>
             <if test="data.price != null">PRICE_ = #{data.price},</if>

--
Gitblit v1.9.3