From c62d25bf9cf51d7421035abd6489945e77db1f04 Mon Sep 17 00:00:00 2001
From: 罗元桥 <2376770955@qq.com>
Date: 星期五, 04 六月 2021 18:29:18 +0800
Subject: [PATCH] Merge branch 'test_future_wangge' into 'test'

---
 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