Merge branch 'test' into 'test_bak'

罗元桥

2021-09-28 f86434155580a034e041dd53b6aad5bf0a4dcd6b

 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/user/SysUserEditTipsDTO.java

@@ -17,6 +17,6 @@
    /**
     * 用户id
     */
    @ApiModelProperty(value = "用户id",hidden = true)
    @ApiModelProperty(value = "用户id", hidden = true)
    private Long userId;
}