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

cjl

2023-09-06 4a4db8924da0782d0b698f7585ad6b0577bdca2d

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

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


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