Merge remote-tracking branch 'origin/master' into master

wl

2022-10-17 d46beba25ccb64a1047a98d642b6ce45e82f0bee

 ycl-platform/src/main/java/com/ycl/service/region/impl/SccgRegionServiceImpl.java

@@ -1,12 +1,12 @@
package com.ycl.service.region.impl;

import com.alibaba.fastjson.JSON;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.ycl.entity.depart.UmsDepart;
import com.ycl.entity.region.SccgRegion;
import com.ycl.mapper.region.SccgRegionMapper;
import com.ycl.service.region.ISccgRegionService;
import com.ycl.service.redis.RedisService;
import com.ycl.service.region.ISccgRegionService;
import com.ycl.utils.common.LiveTimeMillisecond;
import com.ycl.utils.redis.RedisKey;
import org.apache.commons.lang3.StringUtils;
@@ -84,4 +84,9 @@
        }
        return e;
    }

    @Override
    public IPage<SccgRegion> list(SccgRegion sccgRegion) {
        return null;
    }
}