Merge branch 'div_10'

yujian

2019-05-14 efa2645b74ebfadc43ebe448370adb22aecc1ad7

 fanli/src/main/java/com/yeshi/fanli/controller/client/GoodsController.java

@@ -70,7 +70,7 @@
    * @param out

    */

   @RequestMapping(value = "gettaobaolink")

   public void getTaoBaoLink(AcceptData acceptData, Long uid, Long auctionId, HttpServletRequest request,

   public void getTaoBaoLink(AcceptData acceptData, Long uid, Long auctionId,String from, HttpServletRequest request,

         PrintWriter out) {

      if (uid == null || uid <= 0) {

         out.print(JsonUtil.loadFalseResult(1, "用户ID不能为空"));