From 4351e71d782741143a98f86f6648acd16689165f Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Fri, 27 May 2022 19:48:02 +0800
Subject: [PATCH] Merge branch 'developer' into hive2.0

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

diff --git a/zq-erp/src/main/resources/readme-jyy b/zq-erp/src/main/resources/readme-jyy
index 7394481..9369bc5 100644
--- a/zq-erp/src/main/resources/readme-jyy
+++ b/zq-erp/src/main/resources/readme-jyy
@@ -1,12 +1 @@
-删除
-cardCash
-projCash
-只留下
-goodsCash
-产品现金业绩和划扣业绩consume
-
-重构订单，收款，退款等方法不要共用逻辑
-修改t3为业绩类型
-ALTER TABLE `achieve_new`
-CHANGE COLUMN `t3` `achieveType` varchar(100) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL AFTER `t2`;
-
+1、百度编辑器改造获取服务器上传前缀的方法，通过配置文件去获取

--
Gitblit v1.9.1