Merge branch 'dev1'

Administrator

2018-11-14 7ba5c2575d8c13ce53d5d562fe7f6b649e7778b5

 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");