Merge remote-tracking branch 'origin/cjl' into dev

cjl

2023-11-02 a0a6f95ec5b92be03385eea83b64bf97fcbfa17e

 screen-manage/src/main/java/com/moral/api/service/ManageCoordinateService.java

@@ -21,6 +21,6 @@
    void deleteCoordinate(Integer id);


    List<ManageCoordinate> selectCoordinate();
    List<ManageCoordinate> selectCoordinate(String name,String mac);

}