Merge remote-tracking branch 'origin/master'

yujian

2019-05-29 6c224068b1ea8c3f92453bef5175e629deaf780f

 fanli/src/main/java/com/yeshi/fanli/controller/TestController.java

@@ -243,10 +243,6 @@
      }

   }

   

   @RequestMapping(value = "insetDynamicInfoInvite")

   public void insetDynamicInfo(String content, String url,PrintWriter out) {

      dynamicInfoService.insertInviteMaterial(content, url, null, null);

   }



   

   @RequestMapping(value = "insertShop")