Merge remote-tracking branch 'origin/div' into div

admin

2020-06-29 be2b83596b0589cf4f5dcc47bbb3ef40a4876ea9

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

@@ -134,7 +134,7 @@
    * @param out
    */
   @RequestMapping(value = "saveSingleGoods")
   public void saveSingleGoods(String callback, String pid, Long goodsId, Integer goodsType, String videoUrl,
   public void saveSingleGoods(String callback, String pid, String goodsId, Integer goodsType, String videoUrl,
         Integer picNum, String picUrls, HttpServletRequest request, PrintWriter out) {
      try {
         MultipartHttpServletRequest fileRequest = null;