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

cjl

2023-10-20 c7dd4a195d8d893d92c49963447cdf6486844584

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

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


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


}