Merge branch 'shuangzheng2' into huacheng_test

101captain

2022-08-01 f4d47d91a8bf41426497a0c42c10f5a78af0259b

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

@@ -478,7 +478,7 @@
     *            1居民端app协议 2网格员端app协议 3商家端app协议 4隐私政策
     * @return 协议内容
     */
    R agreement(Integer type);
    R agreement(Integer type,String appId);

    /**
     * 维护用户最后登录时间
@@ -899,4 +899,17 @@
     * @return
     */
    R uuPush(@RequestParam("washPhone")String washPhone,@RequestParam("phone")String phone,@RequestParam("washName")String washName,@RequestParam("orderStatus")Integer orderStatus);

    /**
     * 获取城镇或村落列表
     * */
    R getCommunityList(String name,Long id);

    /**
     * 重置密码
     * @param type
     * @param account
     * @return
     */
    R resetPassword(Integer type,String account);
}