From 59cf24b0aba393e145f4ba3d58e98b7a01a80992 Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Mon, 14 Feb 2022 14:58:47 +0800
Subject: [PATCH] fix conflict

---
 zq-erp/src/main/resources/readme-jyy |    5 ++---
 1 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/zq-erp/src/main/resources/readme-jyy b/zq-erp/src/main/resources/readme-jyy
index 7394481..a6787a0 100644
--- a/zq-erp/src/main/resources/readme-jyy
+++ b/zq-erp/src/main/resources/readme-jyy
@@ -6,7 +6,6 @@
 产品现金业绩和划扣业绩consume
 
 重构订单，收款，退款等方法不要共用逻辑
-修改t3为业绩类型
-ALTER TABLE `achieve_new`
-CHANGE COLUMN `t3` `achieveType` varchar(100) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL AFTER `t2`;
+
+把所有历史订单的订单类型区分销售订单和退款订单
 

--
Gitblit v1.9.1