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

admin

2020-07-01 e91ab3c0e8513ea917a655010e518b5508afea3d

 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;