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

Merge branch 'master' of E:\mn\pqs with conflicts.

Browse Source
This commit is contained in:
wurui
2023-02-13 09:33:18 +08:00
parent fd9edd3225
commit 2f16b68ba5
7 changed files with 317 additions and 251 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -19,18 +19,18 @@
</properties>
<dependencies>
<!-- <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>
<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>common-swagger</artifactId>

2
pqs-device/pq-device/pq-device-api/src/main/java/com/njcn/device/pq/pojo/param/DeviceInfoParam.java
View File

@@ -139,7 +139,7 @@ public class DeviceInfoParam implements Serializable {
@ApiModelProperty("时间范围标志 0.查询展示天 1.查询展示月")
private Integer timeFlag;
@ApiModelProperty("报表统计类型 1.年 2.季 3.月 4.周 5.天")
@ApiModelProperty("统计类型 1.年 2.季 3.月 4.周 5.天")
private String reportFlag;
}