Merge branch 'dev' of http://blit.7drlb.com:8888/r/moral into wb

jinpengyong

2023-08-28 a901d8910243b6c15c3ff7722d006e06d87ec6f6

 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;
}