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

Junjie

2023-08-24 e4f82a68cdc10967abf0b69d9846721fdca2b77a

 src/main/java/com/zy/crm/manager/controller/PlanController.java

@@ -575,7 +575,7 @@
        for (Plan plan : page.getRecords()){
            Map<String, Object> map = new HashMap<>();
            map.put("id", plan.getId());
            map.put("value", plan.getName());
            map.put("value", plan.getName()+"---"+plan.getId());
            result.add(map);
        }
        return R.ok(result);