From 239a521e95f6d7fcf8cbf18b71c09140e5d0f55f Mon Sep 17 00:00:00 2001
From: fengxiang <110431245@qq.com>
Date: Fri, 01 Jun 2018 14:58:01 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 src/main/java/com/moral/controller/AreaController.java |    6 ++++--
 1 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/main/java/com/moral/controller/AreaController.java b/src/main/java/com/moral/controller/AreaController.java
index ebafd16..4a2a58b 100644
--- a/src/main/java/com/moral/controller/AreaController.java
+++ b/src/main/java/com/moral/controller/AreaController.java
@@ -1,6 +1,5 @@
 package com.moral.controller;
 
-import com.moral.common.bean.Constants;
 import com.moral.common.bean.ResultBean;
 import com.moral.entity.Area;
 import com.moral.entity.City;
@@ -20,7 +19,10 @@
 public class AreaController {
      @Resource
      AreaService areaService;
-
+   @GetMapping("getfullnames")
+    public ResultBean<String> getFullNames(Integer code){
+      return new ResultBean<>(areaService.queryFullNameByCode(code));
+    }
     @GetMapping("get-provinces")
      public ResultBean<List<Province>> getProvinces(){
          ResultBean<List<Province>> resultBean = new ResultBean<>();

--
Gitblit v1.8.0