Merge branch 'dev' of http://blit.7drlb.com:8888/r/moral into wb

jinpengyong

2023-10-30 14949a6a6e7dec654d13e75f46b24319a624ff8b

 screen-manage/src/main/java/com/moral/api/entity/SpecialDeviceHistory.java

@@ -41,6 +41,11 @@
    private String mac;

    /**
     * 政府站点id
     */
    private String guid;

    /**
     * 维护人id，多个逗号隔开，来源于manage_account
     */
    private String operateIds;