Merge remote-tracking branch 'origin/huacheng_test' into huacheng_test

yanghui

2022-10-27 c7a1a16c8d22b64f9025e800ebaf89b19b530228

 springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/model/dos/SysUserDO.java

@@ -21,7 +21,7 @@
    /**
     * user_id
     */
    @TableId(type = IdType.AUTO)
    @TableId(type = IdType.ASSIGN_ID)
    private Long userId;

    /**
@@ -197,4 +197,19 @@
     */
    private String plaintextPassword;

    /**
     * 街道id
     */
    private Long streetId;

    /**
     * 绑定单位
     */
    private String relationName;

    private String appId;

    private Integer isAccept;

    private Long bindingCheckUnitId;
}