From cbc9250b33a955bc919a6afc5d4101ef65bbfafa Mon Sep 17 00:00:00 2001
From: Junjie <fallin.jie@qq.com>
Date: 星期五, 10 十一月 2023 12:53:03 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/zycrm' into zycrm
---
src/main/java/com/zy/crm/manager/controller/PriSalesController.java | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/src/main/java/com/zy/crm/manager/controller/PriSalesController.java b/src/main/java/com/zy/crm/manager/controller/PriSalesController.java
index aa40111..cea1345 100644
--- a/src/main/java/com/zy/crm/manager/controller/PriSalesController.java
+++ b/src/main/java/com/zy/crm/manager/controller/PriSalesController.java
@@ -152,7 +152,7 @@
initNames.add("鎻愪氦浜у搧璐圭敤鏄庣粏");
initNames.add("閮ㄩ棬缁忕悊瀹℃牳");
initNames.add("涓氬姟鍛樼‘璁�");
- priSales.setSettleMsg(JSON.toJSONString(SettleDto.initSalesPricing(manager,getUser(),initNames,3)));
+ priSales.setSettleMsg(JSON.toJSONString(SettleDto.initSalesPricing(manager,getUser(),getUser(),initNames,3)));
//璁剧疆椤圭洰娴佺▼
plan.setStep(3);
--
Gitblit v1.9.1