Commit Graph

16 Commits (6ab26976d630cf4bc27d70d951f7262a73b24ffd)

Author SHA1 Message Date
lijiayao 6ab26976d6 Merge remote-tracking branch 'origin/server_five_liuyunhu' into server_five_xiaoyao
# Conflicts:
#	couplet-common/couplet-common-core/src/main/java/com/couplet/common/core/constant/ServiceNameConstants.java
#	couplet-modules/couplet-modules-vehicle/src/main/java/com/couplet/vehicle/controller/VehicleController.java
#	couplet-modules/couplet-modules-vehicle/src/main/java/com/couplet/vehicle/service/VehicleService.java
#	couplet-modules/couplet-modules-vehicle/src/main/java/com/couplet/vehicle/service/impl/VehicleServiceImpl.java
2024-04-03 09:03:51 +08:00
lijiayao de572170ec Merge remote-tracking branch 'origin/server_five_fufanrui' into server_five_xiaoyao 2024-04-03 09:01:41 +08:00
ffr c7443b81d7 车辆管理 2024-04-03 08:38:24 +08:00
liuyunhu ffa06bc02e 虎虎虎虎 2024-04-03 08:35:23 +08:00
liuyunhu c3aee00eff 虎虎虎虎 2024-04-02 09:07:40 +08:00
liuyunhu f597b6cbfc 虎,车辆模块完善,前台完善,功能已完成 2024-03-31 22:10:30 +08:00
liuyunhu 42c80590ff 虎,车辆模块优化,车辆和类型的关联 2024-03-31 10:53:19 +08:00
lijiayao 09c28eb1fb Merge remote-tracking branch 'origin/server_five_dongxiaodong' into server_five_xiaoyao
# Conflicts:
#	couplet-auth/src/main/resources/bootstrap.yml
#	couplet-gateway/src/main/resources/bootstrap.yml
#	couplet-modules/couplet-electronic-fence/couplet-electronic-fence-server/src/main/resources/bootstrap.yml
#	couplet-modules/couplet-enterprisemanagement/couplet-enterprisemanagement-server/src/main/resources/bootstrap.yml
#	couplet-modules/couplet-file/src/main/resources/bootstrap.yml
#	couplet-modules/couplet-gen/src/main/resources/bootstrap.yml
#	couplet-modules/couplet-job/src/main/resources/bootstrap.yml
#	couplet-modules/couplet-system/src/main/resources/bootstrap.yml
#	couplet-visual/couplet-monitor/src/main/resources/bootstrap.yml
2024-03-30 00:42:31 +08:00
liuyunhu 3a4ddc8f2e 虎,车辆模块优化、mq模块测试,无法传输参数,数据到达交换机就停了 2024-03-29 22:32:16 +08:00
dongxiaodong 203e7b6561 3/28Dxd提交2 2024-03-29 15:24:39 +08:00
liuyunhu c37f78aecd 更正规范 2024-03-29 09:14:35 +08:00
liuyunhu f46ff2e948 解决配置文件无法覆盖实例问题 2024-03-29 09:11:18 +08:00
liuyunhu 2d6cbf6f1c 车辆模块代码规范更正,新建Mqtt服务,并测试连接,控制台输出接受的报文 2024-03-28 21:55:06 +08:00
liuyunhu b9764dc297 车辆模块代码规范更正,新建Mqtt服务,并测试连接,控制台输出接受的报文 2024-03-28 21:53:50 +08:00
liuyunhu 39c764922c 车辆录入,生成vin码,可以用于模拟车辆和验证车辆上线 2024-03-27 16:58:14 +08:00
liuyunhu 9df04a6af2 aa 2024-03-26 22:37:57 +08:00