From ecb361733a4f90ad1672c422577292a18c0fd2bb Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期五, 03 一月 2020 09:46:59 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/div' 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