Merge branch 'test_esay_photo' into 'test'

罗元桥

2021-06-24 0bae470e8ad7130e2a42d567a30918c8c01f3ab6

 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/grid/EventSpecialPopulationVO.java

@@ -37,6 +37,7 @@
    private Integer age;

    @ApiModelProperty("手机号")
    @EncryptDecryptField
    private String phone;

    @ApiModelProperty("性别（1.男 2.女 3.保密）")