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

cjl

2023-12-18 68e750bf109efb0469704e54e48a29649512358c

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

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

}