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

tangxiaobao

2021-09-06 5fc3fd7cbad93a8bc4a0d13f8217d4e2642450df

 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComExServicemanVO.java

@@ -1,13 +1,14 @@
package com.panzhihua.common.model.vos.community;

import java.util.Date;

import com.fasterxml.jackson.annotation.JsonFormat;
import com.fasterxml.jackson.databind.annotation.JsonSerialize;
import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;

import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;

import java.util.Date;

/**
 * 退役军人Vo