From 3df4f24049c8b3e4c36fde16a67a436ce37f00ad Mon Sep 17 00:00:00 2001
From: JinPengYong <812110275@qq.com>
Date: Sun, 26 Apr 2020 16:18:30 +0800
Subject: [PATCH] Merge branch 'master' of F:\moral\moral\screen_api_v2 with conflicts.
---
src/main/java/com/moral/controller/AreaController.java | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/src/main/java/com/moral/controller/AreaController.java b/src/main/java/com/moral/controller/AreaController.java
index e43be29..f67ef19 100644
--- a/src/main/java/com/moral/controller/AreaController.java
+++ b/src/main/java/com/moral/controller/AreaController.java
@@ -22,7 +22,7 @@
@Resource
AreaService areaService;
@GetMapping("getfullnames")
- public ResultBean<String> getFullNames(Integer code){
+ public ResultBean<String> getFullNames(Long code){
return new ResultBean<>(areaService.queryFullNameByCode(code));
}
@GetMapping("get-provinces")
--
Gitblit v1.8.0