Merge remote-tracking branch 'remotes/origin/developer' into developerB

src/main/java/com/caimei365/user/controller/RegisterApi.java

@@ -62,7 +62,7 @@ public class RegisterApi {
      * @param headers         HttpHeaders
      */
     @ApiOperation("注册普通机构")
-    @Idempotent(prefix = "idempotent_club", keys = {"#baseUser"}, expire = 5)
+    @Idempotent(prefix = "idempotent_club", keys = {"#clubRegisterDto"}, expire = 5)
     @PostMapping("/club")
     public ResponseJson clubRegister(ClubRegisterDto clubRegisterDto, @RequestHeader HttpHeaders headers) {
         return registerService.clubRegister(clubRegisterDto, headers);
@@ -114,6 +114,7 @@ public class RegisterApi {
      */
     @ApiOperation("协销拉机构上线（机构注册）")
     @ApiImplicitParam(required = true, name = "id", value = "暂存机构数据id")
+    @Idempotent(prefix = "idempotent_club", keys = {"#userOnlineDto"}, expire = 5)
     @PostMapping("/club/online")
     public ResponseJson<Integer> clubOnline(OnlineDto online, @RequestHeader HttpHeaders headers) {
         Integer id = online.getId();