six-vehicle
/
cloud-server
5
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Compare commits

base: six-vehicle:0da0c960a6c6e85b210464a728f6f4e050539981
Branches Tags
six-vehicle:dev.analysis
six-vehicle:dev
six-vehicle:dev.entBusiness
six-vehicle:dev.entOperation
six-vehicle:dev.vehicleGateway
six-vehicle:dev.eventProcess
six-vehicle:master
...
compare: six-vehicle:91cb9ab9915666050ccefe51ad227c2fab180bba
Branches Tags
six-vehicle:dev.analysis
six-vehicle:dev
six-vehicle:dev.entBusiness
six-vehicle:dev.entOperation
six-vehicle:dev.vehicleGateway
six-vehicle:dev.eventProcess
six-vehicle:master

2 Commits
0da0c960a6 ... 91cb9ab991

Author SHA1 Message Date
xinzirun 91cb9ab991 Merge remote-tracking branch 'origin/dev' into dev 
# Conflicts:
#	cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-cache/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports
 2024-10-12 10:02:42 +08:00
xinzirun 874a32c41d fix(): 修改企业缓存文件未扫描问题 2024-10-12 10:02:09 +08:00
3 changed files with 2 additions and 3 deletions
Show Stats Expand all files Collapse all files

0
JavaSample-tcp1061513671883/.lck
View File

4
cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-cache/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports
View File

@ -5,6 +5,4 @@ com.muyu.enterprise.cache.CarVehicleCacheService
com.muyu.enterprise.cache.CarMessageValueCacheService com.muyu.enterprise.cache.CarMessageValueCacheService
com.muyu.enterprise.cache.CarWarnCacheService com.muyu.enterprise.cache.CarWarnCacheService
com.muyu.enterprise.cache.ElectronicFenceCacheService com.muyu.enterprise.cache.ElectronicFenceCacheService
com.muyu.enterprise.cache.CarManageCacheService com.muyu.enterprise.cache.CarManageCacheService
com.muyu.enterprise.cache.CarMessageCacheService
com.muyu.enterprise.cache.CarTemplateCacheService

1
cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/enterprise/service/impl/CarManageServiceImpl.java
View File

@ -45,6 +45,7 @@ public class CarManageServiceImpl extends ServiceImpl<CarManageMapper, CarManage
private RemoteEntService remoteEntService; private RemoteEntService remoteEntService;
@Autowired @Autowired
private CarManageMapper carManageMapper; private CarManageMapper carManageMapper;
/** /**
* 车辆列表2 * 车辆列表2
* @param carDTO * @param carDTO