Commit Graph

1929 Commits

Author SHA1 Message Date
69f78414de Merge pull request 'xinwei' (#19) from xinwei into master
Some checks failed
continuous-integration/drone Build is failing
Reviewed-on: #19
2024-08-21 16:29:41 +08:00
a8d4039fea 构建修改 2024-08-21 16:28:56 +08:00
377133dc73 xxl-job跳转地址修改 2024-08-21 16:06:47 +08:00
c0415da552 Merge pull request '构建修改' (#18) from xinwei into master
Some checks failed
continuous-integration/drone Build is failing
Reviewed-on: #18
2024-08-21 11:02:54 +08:00
bfe2032f99 构建修改 2024-08-21 11:02:22 +08:00
7cb8b64830 Merge pull request 'xinwei' (#17) from xinwei into master
All checks were successful
continuous-integration/drone Build is passing
Reviewed-on: #17
2024-08-20 19:33:41 +08:00
6db47c3cf1 构建修改 2024-08-20 19:33:02 +08:00
63b0d1c807 Merge branch 'master' of http://101.43.112.107:3000/root/ludu-cloud into xinwei 2024-08-20 19:27:52 +08:00
547ebae6e9 Merge pull request 'sjy' (#16) from sjy into master
All checks were successful
continuous-integration/drone Build is passing
Reviewed-on: #16
2024-08-20 18:10:43 +08:00
2bd72f906f Resolve merge conflict in VehicleAccessApi.java 2024-08-20 17:27:40 +08:00
1769cb09d7 测试数据 2024-08-20 16:59:29 +08:00
c3627245e8 大屏固定车,临时车数据显示 2024-08-20 16:53:42 +08:00
98ce01b364 大屏固定车,临时车数据显示 2024-08-20 16:31:04 +08:00
d3368e85d3 Merge branch 'master' of http://101.43.112.107:3000/root/ludu-cloud into xinwei 2024-08-20 15:44:33 +08:00
8f595ad135 后台停车场-收费信息模块 2024-08-20 15:36:14 +08:00
0596884364 Merge pull request 'zzw-one' (#15) from zzw-one into master
All checks were successful
continuous-integration/drone Build is passing
Reviewed-on: #15
2024-08-20 15:22:27 +08:00
10604c90c0 大屏接口优化 2024-08-20 14:47:25 +08:00
e732a112f4 Merge branch 'master' of http://101.43.112.107:3000/root/ludu-cloud into zzw-one 2024-08-20 14:16:15 +08:00
5a85f52f32 获得去年日期往前推十天的数据接口优化 2024-08-20 14:01:54 +08:00
ab14de576c Merge pull request 'xinwei' (#14) from xinwei into master
All checks were successful
continuous-integration/drone Build is passing
Reviewed-on: #14
2024-08-20 13:32:28 +08:00
5285a00a9d 构建修改 2024-08-20 13:31:51 +08:00
98ba282fe4 基础服务修改mysql数据源地址 2024-08-20 13:31:42 +08:00
5c93333c4f Merge pull request 'xinwei' (#13) from xinwei into master
All checks were successful
continuous-integration/drone Build is passing
Reviewed-on: #13
2024-08-20 11:53:50 +08:00
ed9ab19f08 网关端口恢复为原来48080 2024-08-20 11:53:17 +08:00
f5ea9be887 线上环境 2024-08-20 11:52:14 +08:00
d9b26479ff 修改大屏接口路径 2024-08-20 11:43:38 +08:00
1b90bc98a2 停车场-远程抬杠模块 2024-08-20 10:01:30 +08:00
f1d9bd23bc 停车场-远程抬杠模块 2024-08-20 10:01:25 +08:00
5553e5f872 Merge pull request '还原为本地环境' (#12) from xinwei into master
Reviewed-on: #12
2024-08-19 23:33:53 +08:00
986a6be07d 还原为本地环境 2024-08-19 23:33:14 +08:00
365d0a5c73 Merge pull request '构建脚本修改' (#11) from xinwei into master
All checks were successful
continuous-integration/drone Build is passing
Reviewed-on: #11
2024-08-19 23:21:38 +08:00
4dd92a2cda 构建脚本修改 2024-08-19 23:21:11 +08:00
d965c4f351 Merge pull request '网关端口为8080' (#10) from xinwei into master
All checks were successful
continuous-integration/drone Build is passing
Reviewed-on: #10
2024-08-19 23:12:03 +08:00
3a6005b53c 网关端口为8080 2024-08-19 23:11:02 +08:00
17ec134c66 Merge pull request 'xinwei' (#9) from xinwei into master
All checks were successful
continuous-integration/drone Build is passing
Reviewed-on: #9
2024-08-19 23:09:02 +08:00
ad6d43fbfa 环境改为线上 2024-08-19 23:06:05 +08:00
d9334fb26d 构建脚本修改 2024-08-19 23:05:46 +08:00
a6c896dbb0 新增线上环境配置文件 2024-08-19 22:40:44 +08:00
ed4f07c886 新增线上环境配置文件 2024-08-19 22:29:00 +08:00
f571601424 Merge pull request 'xinwei' (#8) from xinwei into master
Some checks reported errors
continuous-integration/drone Build was killed
Reviewed-on: #8
2024-08-19 17:11:35 +08:00
723585741c mysql数据源更换到crm服务器 2024-08-19 16:45:36 +08:00
a7c1d9dd3d 原有会员模块删除 2024-08-19 16:33:04 +08:00
03d8f3134e Merge pull request '临时身份证自助补办机接口' (#5) from zzw-one into master
Reviewed-on: #5
2024-08-19 15:40:59 +08:00
2530ddb55b Merge pull request 'xinwei' (#7) from xinwei into master
Reviewed-on: #7
2024-08-19 15:40:49 +08:00
bcc9471b49 Merge remote-tracking branch 'origin/sjy' into xinwei
# Conflicts:
#	ludu-module-parking/ludu-module-parking-api/src/main/java/cn/iocoder/yudao/module/parking/enums/ErrorCodeConstants.java
2024-08-19 15:37:52 +08:00
d1ff02d10b 添加设备告警,白名单,固定车续费后台管理 2024-08-19 15:28:26 +08:00
3a0ac36aab 临时身份证自助补办机接口 2024-08-19 13:08:09 +08:00
9306b3b653 实时车辆进出数据和今日车位统计中利用率修改 2024-08-19 11:47:40 +08:00
3021ea045a 停车场后台-通道修改 2024-08-19 11:46:19 +08:00
206760cf93 Merge pull request 'xinwei' (#4) from xinwei into master
Reviewed-on: #4
2024-08-19 09:48:44 +08:00