Skip to content
Toggle navigation
P
Projects
G
Groups
S
Snippets
Help
黄嘉阳
/
iot-platform-server
This project
Loading...
Sign in
Toggle navigation
Go to a project
Project
Repository
Issues
0
Merge Requests
0
Pipelines
Wiki
Snippets
Settings
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Commit
436e13c6
authored
Nov 14, 2023
by
huangjy
Browse files
Options
_('Browse Files')
Download
Email Patches
Plain Diff
fix:长者导出导入excel问题
parent
11f0e1bd
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
8 additions
and
8 deletions
server-service/src/main/java/com/makeit/dto/platform/elder/PlatElderImportDTO.java
server-service/src/main/java/com/makeit/vo/platform/elder/PlatElderExportVO.java
server-service/src/main/java/com/makeit/dto/platform/elder/PlatElderImportDTO.java
View file @
436e13c6
...
@@ -41,7 +41,7 @@ public class PlatElderImportDTO extends BaseTenantDTO {
...
@@ -41,7 +41,7 @@ public class PlatElderImportDTO extends BaseTenantDTO {
@ApiModelProperty
(
value
=
"小区/社区/街道空间id"
)
@ApiModelProperty
(
value
=
"小区/社区/街道空间id"
)
private
String
streetSpaceId
;
private
String
streetSpaceId
;
@ExcelProperty
({
BIG_TITLE
,
"
小区
"
})
@ExcelProperty
({
BIG_TITLE
,
"
一级空间
"
})
@ApiModelProperty
(
value
=
"小区/社区/街道空间名称"
)
@ApiModelProperty
(
value
=
"小区/社区/街道空间名称"
)
private
String
streetSpaceName
;
private
String
streetSpaceName
;
...
@@ -49,7 +49,7 @@ public class PlatElderImportDTO extends BaseTenantDTO {
...
@@ -49,7 +49,7 @@ public class PlatElderImportDTO extends BaseTenantDTO {
@ApiModelProperty
(
value
=
"楼栋空间id"
)
@ApiModelProperty
(
value
=
"楼栋空间id"
)
private
String
buildingSpaceId
;
private
String
buildingSpaceId
;
@ExcelProperty
({
BIG_TITLE
,
"
楼栋
"
})
@ExcelProperty
({
BIG_TITLE
,
"
二级空间
"
})
@ApiModelProperty
(
value
=
"楼栋空间名称"
)
@ApiModelProperty
(
value
=
"楼栋空间名称"
)
private
String
buildingSpaceName
;
private
String
buildingSpaceName
;
...
@@ -57,7 +57,7 @@ public class PlatElderImportDTO extends BaseTenantDTO {
...
@@ -57,7 +57,7 @@ public class PlatElderImportDTO extends BaseTenantDTO {
@ApiModelProperty
(
value
=
"单元空间id"
)
@ApiModelProperty
(
value
=
"单元空间id"
)
private
String
unitSpaceId
;
private
String
unitSpaceId
;
@ExcelProperty
({
BIG_TITLE
,
"
单元
"
})
@ExcelProperty
({
BIG_TITLE
,
"
三级空间
"
})
@ApiModelProperty
(
value
=
"单元空间名称"
)
@ApiModelProperty
(
value
=
"单元空间名称"
)
private
String
unitSpaceName
;
private
String
unitSpaceName
;
...
@@ -65,7 +65,7 @@ public class PlatElderImportDTO extends BaseTenantDTO {
...
@@ -65,7 +65,7 @@ public class PlatElderImportDTO extends BaseTenantDTO {
@ApiModelProperty
(
value
=
"楼层id"
)
@ApiModelProperty
(
value
=
"楼层id"
)
private
String
floorSpaceId
;
private
String
floorSpaceId
;
@ExcelProperty
({
BIG_TITLE
,
"
楼层
"
})
@ExcelProperty
({
BIG_TITLE
,
"
四级空间
"
})
@ApiModelProperty
(
value
=
"楼层id"
)
@ApiModelProperty
(
value
=
"楼层id"
)
private
String
floorSpaceName
;
private
String
floorSpaceName
;
...
...
server-service/src/main/java/com/makeit/vo/platform/elder/PlatElderExportVO.java
View file @
436e13c6
...
@@ -31,7 +31,7 @@ public class PlatElderExportVO extends BaseTenantDTO {
...
@@ -31,7 +31,7 @@ public class PlatElderExportVO extends BaseTenantDTO {
@ApiModelProperty
(
value
=
"小区/社区/街道空间id"
)
@ApiModelProperty
(
value
=
"小区/社区/街道空间id"
)
private
String
streetSpaceId
;
private
String
streetSpaceId
;
@ExcelProperty
(
"
小区
"
)
@ExcelProperty
(
"
一级空间
"
)
@ApiModelProperty
(
value
=
"小区/社区/街道空间名称"
)
@ApiModelProperty
(
value
=
"小区/社区/街道空间名称"
)
private
String
streetSpaceName
;
private
String
streetSpaceName
;
...
@@ -39,7 +39,7 @@ public class PlatElderExportVO extends BaseTenantDTO {
...
@@ -39,7 +39,7 @@ public class PlatElderExportVO extends BaseTenantDTO {
@ApiModelProperty
(
value
=
"楼栋空间id"
)
@ApiModelProperty
(
value
=
"楼栋空间id"
)
private
String
buildingSpaceId
;
private
String
buildingSpaceId
;
@ExcelProperty
(
"
楼栋
"
)
@ExcelProperty
(
"
二级空间
"
)
@ApiModelProperty
(
value
=
"楼栋空间名称"
)
@ApiModelProperty
(
value
=
"楼栋空间名称"
)
private
String
buildingSpaceName
;
private
String
buildingSpaceName
;
...
@@ -47,7 +47,7 @@ public class PlatElderExportVO extends BaseTenantDTO {
...
@@ -47,7 +47,7 @@ public class PlatElderExportVO extends BaseTenantDTO {
@ApiModelProperty
(
value
=
"单元空间id"
)
@ApiModelProperty
(
value
=
"单元空间id"
)
private
String
unitSpaceId
;
private
String
unitSpaceId
;
@ExcelProperty
(
"
单元
"
)
@ExcelProperty
(
"
三级空间
"
)
@ApiModelProperty
(
value
=
"单元空间名称"
)
@ApiModelProperty
(
value
=
"单元空间名称"
)
private
String
unitSpaceName
;
private
String
unitSpaceName
;
...
@@ -55,7 +55,7 @@ public class PlatElderExportVO extends BaseTenantDTO {
...
@@ -55,7 +55,7 @@ public class PlatElderExportVO extends BaseTenantDTO {
@ApiModelProperty
(
value
=
"楼层id"
)
@ApiModelProperty
(
value
=
"楼层id"
)
private
String
floorSpaceId
;
private
String
floorSpaceId
;
@ExcelProperty
(
"
楼层
"
)
@ExcelProperty
(
"
四级空间
"
)
@ApiModelProperty
(
value
=
"楼层id"
)
@ApiModelProperty
(
value
=
"楼层id"
)
private
String
floorSpaceName
;
private
String
floorSpaceName
;
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment