From 1cb05ff7d74339cb6d5abe1c0d430e7fdb6e0fda Mon Sep 17 00:00:00 2001
From: yj <Administrator@192>
Date: 星期六, 14 三月 2020 15:15:57 +0800
Subject: [PATCH] Merge branch 'div' of ssh://193.112.35.168:29418/fanli-server into div

---
 fanli/src/main/java/com/yeshi/fanli/entity/order/CommonOrderGoods.java |    1 +
 1 files changed, 1 insertions(+), 0 deletions(-)

diff --git a/fanli/src/main/java/com/yeshi/fanli/entity/order/CommonOrderGoods.java b/fanli/src/main/java/com/yeshi/fanli/entity/order/CommonOrderGoods.java
index 191b0b7..16eb390 100644
--- a/fanli/src/main/java/com/yeshi/fanli/entity/order/CommonOrderGoods.java
+++ b/fanli/src/main/java/com/yeshi/fanli/entity/order/CommonOrderGoods.java
@@ -54,6 +54,7 @@
 	@Column(name = "cog_price")
 	private BigDecimal price;
 
+	//瀹為檯浠锋牸
 	@Column(name = "cog_actual_price")
 	private BigDecimal actualPrice;
 

--
Gitblit v1.8.0