Merge remote-tracking branch 'origin/master'

于紫祥_1901

2020-10-22 f0b5148973e9437f3651153e53f8f336c4c3c6ff

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