update: 修改订单预览、提交订单相关

feifan-module-mall/feifan-module-trade-biz/src/main/java/cn/newfeifan/mall/module/trade/dal/dataobject/order/TradeOrderDO.java

@@ -347,13 +347,5 @@ public class TradeOrderDO extends BaseDO {
      * 关联 CombinationRecordDO 的 id 字段
      */
     private Long combinationRecordId;
-    /**
-     * 店铺id
-     */
-    private Long shopId;
-    /**
-     * 商户id
-     */
-    private Long merchantId;
 
 }