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/IrIrrigateSchedulingMapper.xml |    1 +
 1 files changed, 1 insertions(+), 0 deletions(-)

diff --git a/pipIrr-platform/pipIrr-global/src/main/resources/mapper/IrIrrigateSchedulingMapper.xml b/pipIrr-platform/pipIrr-global/src/main/resources/mapper/IrIrrigateSchedulingMapper.xml
index e70a955..4346fd1 100644
--- a/pipIrr-platform/pipIrr-global/src/main/resources/mapper/IrIrrigateSchedulingMapper.xml
+++ b/pipIrr-platform/pipIrr-global/src/main/resources/mapper/IrIrrigateSchedulingMapper.xml
@@ -138,6 +138,7 @@
         cro.crop_name  AS  cropName,
         sch.growth_period AS growthPeriod,
         sch.irrigate_cycle AS irrigateCycle,
+        sch.remarks  AS remarks,
         sch.duration AS duration
         from ir_irrigate_scheduling sch
         left join ir_crop cro on cro.id = sch.crop_id

--
Gitblit v1.8.0