去掉冲突部分

WXD-SEASON\season
1 parent ef1f42fa
Showing 1 changed file with 0 additions and 1 deletions
packageE/pages/cart/cart2/cart2.js
@@ -9096,7 +9096,6 @@ Page({
       mark:true
     })
     //-- 重新计算一下价格 --
->>>>>>> dev_oa_fuordercx
     this.get_cart_next(null, 1, {prom_type: 0, prom_id: 0});
   },