Merge remote-tracking branch 'origin/test' into test

huanghongfa

2021-08-13 c9d1bf762e05e8a83cda1da6c56f4bd96d3b67fc

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