Merge branch 'dev1'

Administrator

2018-11-30 d66e9c7c859f255b0e81e01a57707c5b9a34d7ff

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

@@ -1772,6 +1772,7 @@
      taoBaoGoods.setZkPrice(commonGoods.getPrice());

      taoBaoGoods.setTkRate(commonGoods.getRate());

      taoBaoGoods.setTkCommFee(new BigDecimal("0"));

      taoBaoGoods.setState(commonGoods.getState());

      return taoBaoGoods;

   }