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

zss

2 天以前 d5d089eff99cd51695697679a95445b6b5b0d205

 src/main/java/com/ruoyi/basic/controller/CustomerController.java

@@ -148,8 +148,8 @@
     * 私海客户流回公海
     */
    @Log(title = "客户档案", businessType = BusinessType.OTHER)
    @PostMapping("/back")
    public R back(Long id) {
    @PostMapping("/back/{id}")
    public R back(@PathVariable("id") Long id) {
        return R.ok(customerService.back(id));
    }
}