Merge remote-tracking branch 'origin/div' into div

admin

2020-03-17 8f4a68065574a7ef1f9e8b53902d1f081ec69aab

 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;