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

tangxiaobao

2021-08-19 4cb51a8d6a46993cb30e22dcbaf85424a0ba9d43

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