WL/laws_weilai
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/dev_20230828_RXWIN' into dev_20230828_RXWIN

Browse Source
This commit is contained in:
zyx.net
2023-08-30 14:24:15 +08:00
parent 2318cd4224 70eb93e942
commit d1b0066c87
3 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/entity/ProjectRxswinEO.java
+1 -1
View File
@@ -84,7 +84,7 @@ public class ProjectRxswinEO implements Serializable {
/**版本*/
@Excel(name = "版本", width = 15)
@ApiModelProperty(value = "版本")
@ApiModelProperty(value = "对应版本")
private java.lang.String version;
/**状态（0->保存，1->提交）*/
jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/entity/ProjectRxswinEOEn.java
+1 -1
View File
@@ -83,7 +83,7 @@ public class ProjectRxswinEOEn implements Serializable {
private String rxswin;
/**版本*/
@Excel(name = "Corresponding version", width = 15)
@Excel(name = "Corresponding version", width = 30)
@ApiModelProperty(value = "版本")
private String version;
jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectRxswinEOServiceImpl.java
+2 -2
View File
@@ -428,7 +428,7 @@ public class ProjectRxswinEOServiceImpl extends ServiceImpl<ProjectRxswinEOMappe
if (CutEnum.CN.getValue().equals(projectRxswinEO.getCut())) {
mv.addObject(NormalExcelConstants.CLASS, ProjectRxswinEO.class);
mv.addObject(NormalExcelConstants.DATA_LIST, exportList);
ExportParams exportParams = new ExportParams("RXSWIN", null, "RXSWIN");
ExportParams exportParams = new ExportParams(null, null, "RXSWIN");
mv.addObject(NormalExcelConstants.PARAMS, exportParams);
} else {
List<ProjectRxswinEOEn> dataList = new ArrayList<>();
@@ -439,7 +439,7 @@ public class ProjectRxswinEOServiceImpl extends ServiceImpl<ProjectRxswinEOMappe
}
mv.addObject(NormalExcelConstants.CLASS, ProjectRxswinEOEn.class);
mv.addObject(NormalExcelConstants.DATA_LIST, dataList);
ExportParams exportParams = new ExportParams("RXSWIN", null, "RXSWIN");
ExportParams exportParams = new ExportParams(null, null, "RXSWIN");
mv.addObject(NormalExcelConstants.PARAMS, exportParams);
}
return mv;