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

huanghongfa

2022-03-07 bf71f1fd72fa08204b67bd14a656890015b75247

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

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

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