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

jinpengyong

2023-10-26 9a156c3e20c9dd5c1215bd5dfec5677388777749

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

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

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

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

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

}