Merge remote-tracking branch 'origin/master'

Administrator

2018-11-13 06a7debe678e7ae30f39c61a7f71a926d52d1ae7

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

@@ -729,7 +729,7 @@


      // 设置发货地址

      TaoBaoSearchNav nav = new TaoBaoSearchNav();

      nav.setName("发货地");

      nav.setName("发货地选择");

      nav.setFlag("address");

      nav.setId(11110);

      nav.setType("fahuodi");