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

cjl

2023-09-06 4a4db8924da0782d0b698f7585ad6b0577bdca2d

 screen-manage/src/main/java/com/moral/api/pojo/vo/device/DeviceVO.java

@@ -22,7 +22,6 @@
     * */
    private List<Map<String, Object>> professions;


    /*
     * 工艺
     * */
@@ -63,5 +62,10 @@
     * */
    private List<ManageAccount> operators;

    /*
     * 乡镇街道
     * */
    private Map<String, Object> town;


}