Merge branch 'master' of http://blit.7drlb.com:8888/r/screen_api_v2

ZhuDongming

2019-09-02 e8ef361dc975aeaedeee6f28dfe679489a22f9d5

 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")