From 8b13ca9086a609ef3bae76dab15faba55123d2dd Mon Sep 17 00:00:00 2001 From: Null <281575458@qq.com> Date: 星期三, 17 三月 2021 09:17:47 +0800 Subject: [PATCH] 处理合并代码问题 --- springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/user/SysUserAgreementVO.java | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/user/SysUserAgreementVO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/user/SysUserAgreementVO.java index ef37b74..90481b2 100644 --- a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/user/SysUserAgreementVO.java +++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/user/SysUserAgreementVO.java @@ -20,7 +20,7 @@ @ApiModelProperty("id") private Long id; - @ApiModelProperty("所属app 1居民端app 2网格员端app 3商家端app") + @ApiModelProperty("所属app 1居民端app 2网格员端app 3商家端app 4隐私政策") private Integer type; @ApiModelProperty("协议内容") -- Gitblit v1.7.1