Merge branch 'huacheng_push' into huacheng_test

zhaozhengjie

2022-09-08 bb37b8ff2eac4cb2ab9997a50bf68f5bde16d661

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

@@ -912,7 +912,7 @@
     * @param account
     * @return
     */
    R resetPassword(Integer type,String account);
    R resetPassword(Integer type,String account,String appId);

    /**
     * 天府通办登录