冲突提交

yujian

2019-03-12 4a05f1c9c508ab7f10c5eae22a5c716f5454ca02

 fanli/src/main/java/com/yeshi/fanli/controller/apph5/AppH5ShareController.java

@@ -35,8 +35,9 @@
            JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult("传递参数不正确"));

            return;

         }

			
         // 获取商品信息

         JSONObject data = userShareGoodsRecordService.getGoodsGroup(shareId);

         JSONObject data = userShareGoodsRecordService.getGoodsGroupDetail(shareId);

         JsonUtil.printMode(out, callback, JsonUtil.loadTrueResult(data));

         

      } catch (Exception e) {