Merge branch 'cjl' into dev

cjl

2025-01-06 27e6bc3df3e39e0d0b147b155a89ad6837ea972b

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

@@ -135,13 +135,21 @@
     */
    private String extend;

    /**
     * 乡镇，街道code
     */
    private Integer townCode;

    /*
     * 设备型号
     * */
    @TableField(exist = false)
    private Version version;


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


}