Merge branch 'div'

yujian

2019-01-29 eb9da1ad5c4054d9ce3dab2446deade9f5b09c7d

 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 {