Merge branch 'master' of http://gitlab.nhys.cdnhxx.com/root/zhihuishequ

infrasys00

2021-02-25 e55127388abe16a13eafa2a22562742d209e2396

 springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/dao/UserDao.java

@@ -351,7 +351,7 @@
            "SELECT \n" +
            "u.id+100000000 'order',\n" +
            "u.door_number doorNumber,\n" +
            "u.is_rent isRent,\n" +
            "if(u.is_rent=1,'租住','自主')isRent,\n" +
            "u.name,\n" +
            "u.nation,\n" +
            "case u.political_outlook when 1 then '党员'  when 2 then '团员' else '群众' end politicalOutlook,\n" +