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

admin

2019-08-26 6009c2c07cd32a76b32c8d63a5a017be695c5ea5

 fanli/src/main/java/com/yeshi/fanli/controller/client/v2/IntegralControllerV2.java

@@ -11,7 +11,6 @@
import java.util.Set;



import javax.annotation.Resource;

import javax.servlet.http.HttpSession;



import org.springframework.stereotype.Controller;

import org.springframework.web.bind.annotation.RequestMapping;

@@ -414,7 +413,6 @@


         GsonBuilder gsonBuilder = new GsonBuilder().excludeFieldsWithoutExposeAnnotation();

         Gson gson = gsonBuilder.create();



         JSONObject data = new JSONObject();

         data.put("result", gson.toJson(exchange));

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