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

jinpengyong

2023-08-04 b5a2fc07527ab700544f3b7ba0be01b2e015e2db

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

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


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