From f1aa196ca63b8c287c5af61214881259c13db69b Mon Sep 17 00:00:00 2001
From: yujian <yujian@123.com>
Date: 星期三, 11 九月 2019 15:48:05 +0800
Subject: [PATCH] Merge branch 'div' of ssh://193.112.35.168:29418/fanli-server into div
---
fanli/src/main/java/com/yeshi/fanli/controller/client/v1/ApiController.java | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/controller/client/v1/ApiController.java b/fanli/src/main/java/com/yeshi/fanli/controller/client/v1/ApiController.java
index 0bbe3c5..76f91a6 100644
--- a/fanli/src/main/java/com/yeshi/fanli/controller/client/v1/ApiController.java
+++ b/fanli/src/main/java/com/yeshi/fanli/controller/client/v1/ApiController.java
@@ -6,13 +6,13 @@
import org.springframework.web.bind.annotation.RequestMapping;
import com.yeshi.fanli.entity.accept.AcceptData;
-
+import com.yeshi.fanli.util.Constant;
@Controller
@RequestMapping("api/v1")
public class ApiController {
@RequestMapping("hello")
- public void hello(AcceptData acceptData,PrintWriter out){
- out.print("杩斿埄鍒�");
+ public void hello(AcceptData acceptData, PrintWriter out) {
+ out.print(Constant.getAppName(acceptData.getPlatform(), acceptData.getVersion()));
}
}
--
Gitblit v1.8.0