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

101captain

2022-07-08 49eaaadd7fa643c9101d2b63a9b84ebdda83e02a

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

@@ -853,4 +853,6 @@
     * @return
     */
    R checkExport(@RequestParam("account")String account, @RequestParam("password")String password,@RequestParam("oldPassword")String oldPassword);

    R newIndexData(Integer type, Long streetId);
}