Merge remote-tracking branch 'origin/master'

yujian

2019-01-26 482289c43fa8241592c35792c7091b275b638ed6

 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 {