Merge remote-tracking branch 'origin/test_future_wangge' into test_future_w...

huanghongfa

2021-06-07 8788a78ad30c1bb9d50d91b10e76d3ae47ed8da2

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