冲突文件

yujian

2019-07-10 aad0554cc7f18a6ec05e2e5e646b5e501d41617d

 fanli/src/main/java/com/yeshi/fanli/util/taobao/TaoBaoUtil.java

@@ -705,6 +705,8 @@
      tg.setReservePrice(tb.getReservePrice());

      tg.setUserType(tb.getUserType());

      tg.setShopTitle(tb.getShopTitle());

      tg.setTkRate(tb.getTkRate());

      tg.setSellerId(tb.getSellerId());

      tg.setState(tb.getState()); // 状态：2018-12-03

      if (tb.getCouponAmount().compareTo(BigDecimal.valueOf(0)) > 0) {