From e64197421cf28099935f71f193989a3394d47fe0 Mon Sep 17 00:00:00 2001
From: mrzcc <121184950@qq.com>
Date: 星期一, 17 二月 2020 18:12:38 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
WebService/src/main/java/com/java110/web/components/machineRecord/MachineVistorPhotoManageComponent.java | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/WebService/src/main/java/com/java110/web/components/machineRecord/MachineVistorPhotoManageComponent.java b/WebService/src/main/java/com/java110/web/components/machineRecord/MachineVistorPhotoManageComponent.java
index 09c1144..dda954a 100644
--- a/WebService/src/main/java/com/java110/web/components/machineRecord/MachineVistorPhotoManageComponent.java
+++ b/WebService/src/main/java/com/java110/web/components/machineRecord/MachineVistorPhotoManageComponent.java
@@ -17,7 +17,7 @@
*
* 2019-06-29
*/
-@Component("machineVistorPhotoRecordManage")
+@Component("machineVistorPhotoManage")
public class MachineVistorPhotoManageComponent {
@Autowired
@@ -32,7 +32,7 @@
JSONObject reqParam = JSONObject.parseObject(pd.getReqData());
reqParam.put("recordTypeCd", "6666");
- IPageData newPd = PageData.newInstance().builder(pd.getUserId(), pd.getToken(),
+ IPageData newPd = PageData.newInstance().builder(pd.getUserId(),pd.getUserName(), pd.getToken(),
reqParam.toJSONString(), pd.getComponentCode(), pd.getComponentMethod(), "", pd.getSessionId());
return listMachineRecordsSMOImpl.listMachineRecords(newPd);
--
Gitblit v1.8.0