Merge branch 'local_20221104' into haucheng_panzhihua

yanghui

2022-11-11 50a71933495034686c22266b2818c138143c913c

 springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/service/UserService.java

@@ -916,6 +916,12 @@
    R getCommunityList(String name,Long id);

    /**
     * 获取所有城镇或村落列表
     * @return
     */
    R getAllCommunityList();

    /**
     * 重置密码
     * @param type
     * @param account