Microservice/pqs
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 1 Wiki Activity

工作流模块提交

Browse Source
This commit is contained in:
hongawen
2024-05-09 14:23:18 +08:00
parent bedd70136b
commit 4936d22884
98 changed files with 6780 additions and 108 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
pqs-device/device-boot/pom.xml
View File

@@ -21,16 +21,16 @@
<dependencies>
<!--pq-device-boot和pms-device-boot只能选择一个-->
<!-- <dependency>
<dependency>
<groupId>com.njcn</groupId>
<artifactId>pq-device-boot</artifactId>
<version>${project.version}</version>
</dependency>-->
<dependency>
<groupId>com.njcn</groupId>
<artifactId>pms-device-boot</artifactId>
<version>${project.version}</version>
</dependency>
<!-- <dependency>-->
<!-- <groupId>com.njcn</groupId>-->
<!-- <artifactId>pms-device-boot</artifactId>-->
<!-- <version>${project.version}</version>-->
<!-- </dependency>-->
<dependency>
<groupId>com.njcn</groupId>

2
pqs-device/pq-device/pq-device-api/src/main/java/com/njcn/device/pq/pojo/bo/excel/OracleTerminalExcel.java
View File

@@ -134,7 +134,7 @@ public class OracleTerminalExcel implements Serializable {
@Excel(name = "合同号", width = 15)
private String contract;
@Excel(name = "电度功能", replace = {"关闭_0", "开启_1"}, width = 15)
@Excel(name = "电度功能", replace = {"关闭_0", "开启_1","null_0"}, width = 15)
private Integer electroplate;
@Excel(name = "母线", width = 15)