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

jinpengyong

2023-09-22 3271a0e7421aa7c55f475be8f24ad85b576108b8

 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() {