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

cjl

2023-08-23 5f7d27060aeca3f23737db21e06fc07c8e28f1a8

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

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


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