From 0edab788f512d3c269c6b5caa62682dc1ef396f4 Mon Sep 17 00:00:00 2001
From: DESKTOP-71BH0QO\L、ming <172680469@qq.com>
Date: 星期二, 30 三月 2021 18:04:20 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/dao/SysUserInputDAO.java | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/dao/SysUserInputDAO.java b/springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/dao/SysUserInputDAO.java
index fbbdaf3..edfa76f 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/dao/SysUserInputDAO.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/dao/SysUserInputDAO.java
@@ -225,7 +225,7 @@
"if(u.lowIncome_people=1,'是','否') lowIncomePeople, " +
"if(u.old_people=1,'是','否') oldPeople, " +
"if(u.special_service_family=1,'是','否') specialServiceFamily, " +
- "if(u.key_personnel=1,'是','否') keyPersonnel " +
+ "if(u.key_personnel=1,'是','否') keyPersonnel, " +
"u.tags " +
"FROM " +
" sys_user_input u " +
@@ -273,7 +273,7 @@
"if(u.lowIncome_people=1,'是','否') lowIncomePeople, " +
"if(u.old_people=1,'是','否') oldPeople, " +
"if(u.special_service_family=1,'是','否') specialServiceFamily, " +
- "if(u.key_personnel=1,'是','否') keyPersonnel " +
+ "if(u.key_personnel=1,'是','否') keyPersonnel, " +
"u.tags " +
"FROM " +
" sys_user_input u " +
--
Gitblit v1.7.1