Merge remote-tracking branch 'origin/test' into test

huanghongfa

2021-09-27 634c8b22ca833ce38afa7a100c00978b9fce43c2

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

@@ -702,6 +702,11 @@
    R resetPassword(Long userId);

    /**
     * 批量重置密码
     */
    R resetPasswordPatch(Long[] userId,String password);

    /**
     * 便民服务新增商家账号
     * @param convenientMerchantDTO
     * @return 商家用户id