From e2a6779e69ca96a6d538d415613c8c09963ab659 Mon Sep 17 00:00:00 2001 From: wuzeyu <1223318623@qq.com> Date: 星期五, 13 十二月 2024 16:56:44 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/master' --- 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