Merge remote-tracking branch 'origin/master'

admin

2019-02-27 ad3119f7b7e0375a8363b900346284bb1c274a3d

 fanli/src/main/java/com/yeshi/fanli/controller/admin/PushGoodsController.java

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

    */

   @RequestMapping(value = "save")

   public void save(String callback, PushGoods pushGoods, Long editorUid, String idArray, PrintWriter out) {

   public void save(String callback, PushGoods pushGoods, String idArray, PrintWriter out) {

      

      try {