From 6cebcdd663ac06a6a8aa931058a515aa38a14bc3 Mon Sep 17 00:00:00 2001
From: fengjin <1435304038@qq.com>
Date: 星期二, 01 十一月 2022 15:56:42 +0800
Subject: [PATCH] Merge branch 'zigonggao_dev' into huacheng_test
---
flower_city/src/main/java/com/dg/core/api/GuideRepairOrderAppletsController.java | 8 ++++----
1 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/flower_city/src/main/java/com/dg/core/api/GuideRepairOrderAppletsController.java b/flower_city/src/main/java/com/dg/core/api/GuideRepairOrderAppletsController.java
index 7602041..fb070d1 100644
--- a/flower_city/src/main/java/com/dg/core/api/GuideRepairOrderAppletsController.java
+++ b/flower_city/src/main/java/com/dg/core/api/GuideRepairOrderAppletsController.java
@@ -247,8 +247,8 @@
entity.setCreateTime(LocalDateTime.now());
entity.setUpdateTime(LocalDateTime.now());
entity.setState("5");
- entity.setDepartmentalId(sysUser.getDepartmentId());
- entity.setToUserId(sysUser.getUserId()+"");
+ entity.setFromDepartmentalId(sysUser.getDepartmentId());
+ entity.setFromUserId(sysUser.getUserId()+"");
entity.setGuideId(order.getId().toString());
iGuideEvolveService.insertConfig(entity);
return toAjax(iGuideRepairOrderService.updateConfig(order));
@@ -287,8 +287,8 @@
guideEvolveEntity.setCreateTime(LocalDateTime.now());
guideEvolveEntity.setUpdateTime(LocalDateTime.now());
guideEvolveEntity.setState("13");
- guideEvolveEntity.setDepartmentalId(sysUser.getDepartmentId());
- guideEvolveEntity.setToUserId(sysUser.getUserId()+"");
+ guideEvolveEntity.setFromDepartmentalId(sysUser.getDepartmentId());
+ guideEvolveEntity.setFromUserId(sysUser.getUserId()+"");
guideEvolveEntity.setGuideId(entity.getId().toString());
int i = iGuideRepairOrderService.updateConfig(entity);
if (i>0)
--
Gitblit v1.7.1