Merge remote-tracking branch 'origin/sanshuohuitang_dev' into sanshuohuitan...

manailin

2022-09-14 29167f6c5d895749f369fadbcd4b3c0a3a17052c

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

@@ -929,5 +929,5 @@
    /**
     * 三说会堂后台重置密码
     * */
    R resetPassExpertOrIndustryCenter(Long userId,String password);
    R resetPassExpertOrIndustryCenter(String account,String password);
}