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

cjl

2023-09-06 d50faa74719f4d3f18ec9f99d99483f2c119c3a0

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