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

101captain

2022-02-25 caefe9a9cc486247f831e46356b0b03ca450fdf9

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

@@ -157,7 +157,7 @@
     *            用户id
     * @return 人员详情
     */
    R detailUser(Long userId);
    R<LoginUserInfoVO> detailUser(Long userId);

    /**
     * 设置用户标签
@@ -813,4 +813,11 @@
     * @return
     */
    R bindOrAddMcsUser(BindUserPhoneDTO bindUserPhoneDTO);

    /**
     * 更新街道id
     * @param administratorsUserVO
     * @return
     */
    R updateStreetId(AdministratorsUserVO administratorsUserVO);
}