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

Junjie

2023-11-10 bb71b47a43244e6db57cbc3cd0223bc5a64023d7

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

@@ -115,6 +115,7 @@
            Map<String, Object> map = new HashMap<>();
            map.put("id", company.getId());
            map.put("value", company.getId());
            map.put("name", company.getName());
            result.add(map);
        }
        return R.ok(result);