From 2c19b79eade460a50f0d61b2e41e46662286934e Mon Sep 17 00:00:00 2001
From: 张天森 <1292933220@qq.com>
Date: 星期四, 13 十月 2022 17:28:24 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/huacheng_test' into huacheng_test

---
 flower_city/src/main/java/com/dg/core/controller/GuideRepairOrderController.java |    8 ++++----
 1 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/flower_city/src/main/java/com/dg/core/controller/GuideRepairOrderController.java b/flower_city/src/main/java/com/dg/core/controller/GuideRepairOrderController.java
index be3fd0a..7314f5c 100644
--- a/flower_city/src/main/java/com/dg/core/controller/GuideRepairOrderController.java
+++ b/flower_city/src/main/java/com/dg/core/controller/GuideRepairOrderController.java
@@ -174,10 +174,10 @@
         entity.setCreateTime(LocalDateTime.now());
         entity.setUpdateTime(LocalDateTime.now());
         entity.setState("12");
-        entity.setDepartmentalId(sysUser.getDepartmentId());
-        entity.setToUserId(sysUser.getUserId()+"");
-        entity.setFromUserId(order.getGuideUserId());
-        entity.setFromDepartmentalId(order.getGuideDepartmentId());
+        entity.setDepartmentalId(order.getGuideDepartmentId());
+        entity.setToUserId(order.getGuideUserId());
+        entity.setFromUserId(sysUser.getUserId()+"");
+        entity.setFromDepartmentalId(sysUser.getDepartmentId());
         entity.setGuideId(order.getId().toString());
 
         iGuideEvolveService.insertConfig(entity);

--
Gitblit v1.7.1