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

jinpengyong

2023-10-26 88efd467e418eda9c57ce38ee248f83445d2efc5

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

@@ -149,4 +149,5 @@
     *序号
     * */
    private Integer devNum;

}