From 3128a684d6654131f01472ee95aa3f09a9d12dac Mon Sep 17 00:00:00 2001
From: liurunyu <lry9898@163.com>
Date: 星期三, 26 三月 2025 14:24:50 +0800
Subject: [PATCH] 1、git同步冲突引起文件丢失，进行系统恢复，并屏蔽一个非git提交的模块； 2、增加文件《增加一个单位（orgTag）》。

---
 pipIrr-platform/pipIrr-global/src/main/resources/mapper/IrCropMapper.xml |    3 ++-
 1 files changed, 2 insertions(+), 1 deletions(-)

diff --git a/pipIrr-platform/pipIrr-global/src/main/resources/mapper/IrCropMapper.xml b/pipIrr-platform/pipIrr-global/src/main/resources/mapper/IrCropMapper.xml
index fb1c0b8..da5e8f4 100644
--- a/pipIrr-platform/pipIrr-global/src/main/resources/mapper/IrCropMapper.xml
+++ b/pipIrr-platform/pipIrr-global/src/main/resources/mapper/IrCropMapper.xml
@@ -84,7 +84,8 @@
     <select id="getCrops" resultType="com.dy.pipIrrGlobal.voIr.VoCrop">
         SELECT
         CAST(cro.id AS char)AS id,
-        cro.crop_name  AS  cropName
+        cro.crop_name  AS  cropName,
+        cro.remarks
         FROM ir_crop cro
         <where>
             cro.deleted = 0

--
Gitblit v1.8.0