Merge branch 'master' of F:\moral\moral\screen_api_v2 with conflicts.

JinPengYong

2020-04-26 3df4f24049c8b3e4c36fde16a67a436ce37f00ad

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