From b5960ac13f8d67c0baf8f23ffb2e24de1494cbf7 Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Mon, 14 Mar 2022 15:27:25 +0800
Subject: [PATCH] Merge branch 'developer' into alpha

---
 zq-erp/src/main/resources/readme-jyy |   11 +----------
 1 files changed, 1 insertions(+), 10 deletions(-)

diff --git a/zq-erp/src/main/resources/readme-jyy b/zq-erp/src/main/resources/readme-jyy
index 87f39e4..9369bc5 100644
--- a/zq-erp/src/main/resources/readme-jyy
+++ b/zq-erp/src/main/resources/readme-jyy
@@ -1,10 +1 @@
-删除
-cardCash
-projCash
-只留下
-goodsCash
-产品现金业绩和划扣业绩consume
-
-重构订单，收款，退款等方法不要共用逻辑
-
-把所有历史订单的订单类型区分销售订单和退款订单
+1、百度编辑器改造获取服务器上传前缀的方法，通过配置文件去获取

--
Gitblit v1.9.1