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

jinpengyong

2023-10-25 02a6c170797c5d2750ed07b21f22396a7683c54e

 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;