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/EventSpecialPopulationDetailsVO.java

@@ -25,6 +25,7 @@
   private String name;

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

   @ApiModelProperty(value = "身份证号码")