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

kaiyu

2020-12-02 3aa2f5aa4c7963e7bcfbc0d710c286c826338df9

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