Merge remote-tracking branch 'origin/master' into cc_20240411_supportskip

# Conflicts:
#	coolstore-partner-web/src/main/java/com/cool/store/controller/webb/LineInfoController.java

coolstore-partner-web/src/main/java/com/cool/store/controller/webb/LineInfoController.java

@@ -146,6 +146,13 @@ public class LineInfoController {
         return ResponseResult.success(lineService.addLine(addLineRequest));
     }
 
+
+    @ApiOperation("修改加盟模式")
+    @PostMapping("/changeJoinMode")
+    public ResponseResult<Boolean> changeJoinMode(@RequestBody ChangeInvestmentRequest changeInvestmentRequest) {
+        return ResponseResult.success(lineService.changeJoinMode(changeInvestmentRequest));
+    }
+
     @ApiOperation("跳过意向金")
     @GetMapping("/skipPay")
     @ApiImplicitParams({