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

jinpengyong

2023-08-22 c3e8b19537332aa0e5282cae78d3ea9c9189fd4e

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

@@ -129,6 +129,11 @@
     */
    private String extend;

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


    @Override
    protected Serializable pkVal() {