Merge branch 'test_bak' into 'master'

罗元桥

2021-09-29 161b77a90e4743a96b083a0653c3ae4b8245f589

 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/screen/ComMngPopulationAgeVO.java

@@ -1,10 +1,10 @@
package com.panzhihua.common.model.vos.screen;

import java.io.Serializable;

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

import java.io.Serializable;

/**
 * @author xyh