Merge remote-tracking branch 'origin/master'

doum

10 小时以前 59b1f0e9967902aa10f5e017d5a0bdfd1b60c9ea

 server/services/src/main/java/com/doumee/service/business/impl/AreasServiceImpl.java

@@ -133,6 +133,11 @@
    }

    @Override
    public Areas getById(Integer id) {
       return areasMapper.selectById(id);
    }

    @Override
    public Areas findById(Integer id) {
        if(ALL_AREA_LIST!=null){
            for(Areas a : ALL_AREA_LIST){