From dbbdbab62839ce6ba271d2144e37ab6b05f42c78 Mon Sep 17 00:00:00 2001
From: tangzy <tangzy123456>
Date: Sat, 16 Jul 2022 08:48:21 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/main/java/org/springblade/modules/lang/mapper/LandMapper.xml | 7 ++++++-
1 files changed, 6 insertions(+), 1 deletions(-)
diff --git a/src/main/java/org/springblade/modules/lang/mapper/LandMapper.xml b/src/main/java/org/springblade/modules/lang/mapper/LandMapper.xml
index 37be076..87a2960 100644
--- a/src/main/java/org/springblade/modules/lang/mapper/LandMapper.xml
+++ b/src/main/java/org/springblade/modules/lang/mapper/LandMapper.xml
@@ -63,7 +63,12 @@
land_name,
land_area,
ST_ASTEXT(land_range) as land_range,
- url
+ url,
+ type,
+ land_type,
+ land_unit,
+ dept_id,
+ farm_id
FROM sys_land
where is_deleted = 0
<if test="land.landType!=null and land.landType != ''">
--
Gitblit v1.9.3