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

cjl

2023-10-16 0eaefd62a7caa039a4f16e27be279eac5e84da5c

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

@@ -145,6 +145,9 @@
    * */
    @TableField(exist = false)
    private Version version;

    /*
     *序号
     * */
    private Integer devNum;

}