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

cjl

2023-08-02 ee2d9a4049baa9ecc3f43d0576fd3745688171be

 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;


}