From 151bfa7ab112a0675f4ca48cc414f4398b30cd0d Mon Sep 17 00:00:00 2001
From: 罗元桥 <2376770955@qq.com>
Date: 星期五, 16 七月 2021 21:37:45 +0800
Subject: [PATCH] Merge branch 'test' into 'master'
---
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComMngPopulationServeExcelVO.java | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComMngPopulationServeExcelVO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComMngPopulationServeExcelVO.java
index c9d6341..4331404 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComMngPopulationServeExcelVO.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComMngPopulationServeExcelVO.java
@@ -144,7 +144,7 @@
@ExcelProperty(value = "是否死亡(是/否)", index = 41)
private Integer death;
- @ExcelProperty(value = "退役军人(是/否)", index = 41)
+ @ExcelProperty(value = "退役军人(是/否)", index = 42)
private Integer veterans;
@ExcelProperty(value = "残疾人(是/否)", index = 43)
--
Gitblit v1.7.1