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

cjl

2023-08-11 eb6d41359a8957c6355275f7697db202d6a523db

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