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

tangxiaobao

2021-09-04 52e0ad7f25ca50e375bce10e47c9e30f3d39bdb2

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

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

import com.alibaba.excel.annotation.ExcelProperty;
import lombok.Data;

import java.io.Serializable;

import com.alibaba.excel.annotation.ExcelProperty;

import lombok.Data;

@Data
public class ComMngPopulationImportErrorVO implements Serializable {