Merge remote-tracking branch 'origin/master'

Administrator

2023-08-25 7f21d4f22ec711d6aa89900b07e0b5ac31dbac42

 ard-work/src/main/java/com/ruoyi/sy/controller/ArdSyCarController.java

@@ -13,7 +13,7 @@
import com.ruoyi.sy.gps31.PushClientImplAlarm;
import com.ruoyi.sy.gps31.PushClientImplPosition;
import com.ruoyi.sy.service.IArdSyUserService;
import com.ruoyi.system.domain.SysConfig;
import com.ruoyi.common.core.domain.entity.SysConfig;
import com.ruoyi.system.service.ISysConfigService;
import com.ruoyi.system.service.ISysDeptService;
import com.ruoyi.system.service.ISysUserService;