Merge branch 'cjl' into qa

cjl

2023-10-20 cbdb9ea8d17e07dda2362d1c61e867afe8395ef2

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

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

}