Merge branch 'test' into 'test_esay_photo'

罗元桥

2021-06-24 11b327fa3151205a340d9a4337afb096b776594a

 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("协议内容")