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

cjl

2023-10-20 a3eaa78c6d839b640c728f4c7d8eb27732627b07

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

@@ -146,7 +146,10 @@
    @TableField(exist = false)
    private Version version;


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


}