Merge remote-tracking branch 'origin/wb' into qa

jinpengyong

2023-09-06 e2411fee13ff406db4aa5d994d7dcffdf4482cab

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