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

cjl

2023-10-25 090f4dac98c412c5734a706b853724e2d2accda4

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

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

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

}