Merge branch 'div'

yujian

2019-03-01 56e258fa6c23469ea825f6b11d458df9ba577e9f

 fanli/src/main/java/com/yeshi/fanli/controller/client/RecommendController.java

@@ -2286,12 +2286,16 @@
                  }

               }

            }

         } 
			
         if (listSpecial == null) {

            listSpecial = new ArrayList<Special>();

         }



         JSONObject root = new JSONObject();

         root.put("special", listSpecial);



         out.print(JsonUtil.loadTrueResult(root));

			
      } catch (Exception e) {

         e.printStackTrace();

      }