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

cjl

2023-08-09 83e42707519f5e2d886618ea55c30e8c3ab381ac

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

@@ -135,11 +135,18 @@
     */
    private String extend;

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

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


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