From 830e18bcfac0a9ac2c5c9e175affc4b9c1889a58 Mon Sep 17 00:00:00 2001
From: 刘小明 <liuxm_a@163.com>
Date: 星期四, 15 八月 2024 20:13:38 +0800
Subject: [PATCH] 测试git提交冲突问题
---
pms-parent/pms-web-report/src/main/java/com/dy/pmsReport/deviceReport/DeviceReportCtl.java | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/pms-parent/pms-web-report/src/main/java/com/dy/pmsReport/deviceReport/DeviceReportCtl.java b/pms-parent/pms-web-report/src/main/java/com/dy/pmsReport/deviceReport/DeviceReportCtl.java
index 75ad088..3ab6997 100644
--- a/pms-parent/pms-web-report/src/main/java/com/dy/pmsReport/deviceReport/DeviceReportCtl.java
+++ b/pms-parent/pms-web-report/src/main/java/com/dy/pmsReport/deviceReport/DeviceReportCtl.java
@@ -25,7 +25,7 @@
@GetMapping(path = "getDeviceInfo")
public BaseResponse<Map<String, Object>> getDeviceInfo(String deviceNo) {
- log.info("DeviceReportCtl.getDeviceInfo()");
+ log.info("DeviceReportCtl.getDeviceInfo():{}",deviceNo);
Map<String, Object> result = sv.getDeviceInfo(deviceNo);
return BaseResponseUtils.buildSuccess(result);
}
--
Gitblit v1.8.0