红德堂-合并master代码

fs-admin/src/main/java/com/fs/course/controller/FsCourseTrafficLogController.java

@@ -1,5 +1,6 @@
 package com.fs.course.controller;
 
+import java.text.SimpleDateFormat;
 import java.util.List;
 import java.util.stream.Collectors;
 

fs-service/src/main/java/com/fs/company/service/impl/CompanyServiceImpl.java

@@ -42,10 +42,8 @@ import com.fs.system.mapper.SysConfigMapper;
 import com.fs.system.service.ISysConfigService;
 import com.github.pagehelper.PageHelper;
 import com.google.gson.Gson;
-import com.hc.openapi.tool.util.ObjectUtils;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.collections4.CollectionUtils;
-import org.apache.commons.lang3.ObjectUtils;
 import org.redisson.api.RLock;
 import org.redisson.api.RedissonClient;
 import org.slf4j.Logger;