Merge remote-tracking branch 'origin/test' into txb

tangxiaobao

2021-07-23 1d16cf86e7cff1f754576620aa27370b91df0004

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

@@ -159,4 +159,10 @@
     * 残疾人
     */
    private Integer disability;

    /**
     * 标签
     */
    @TableField(updateStrategy = FieldStrategy.IGNORED)
    private String tags;
}