Merge remote-tracking branch 'origin/master'

Administrator

2018-11-26 3c22acc75a10799ccb4ce6ca0aba195ecfe29c15

Merge remote-tracking branch 'origin/master'

 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;

    }