Merge branch 'acid_push' into huacheng_test

zhaozhengjie

2022-09-16 702aaf26da08f4a9576377bb5196aba5073e0637

 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/user/UserService.java

@@ -1274,4 +1274,9 @@

    @PostMapping("/tfLogin")
    R tfLogin(@RequestBody UuLoginVO uuLoginVO);


    @GetMapping("/accept")
     R accept(Long userId);

}