Merge branch 'test' into 'master'

罗元桥

2021-07-12 0dc0a47cf5f655cb0dbff082f7c36613c21e328b

 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.保密）")