|
|
09133421bc
|
Merge pull request '更改智慧码头token配置 售票身份证判空修改' (#105) from cgt into master
continuous-integration/drone Build is passing
Reviewed-on: #105
|
2025-01-26 14:25:57 +08:00 |
|
punchhhh
|
fed667d49c
|
海康区域监控点添加total
|
2025-01-26 14:14:57 +08:00 |
|
punchhhh
|
e9cf599dcf
|
更改智慧码头token配置 售票身份证判空修改
|
2025-01-26 12:56:17 +08:00 |
|
|
|
7493fb956b
|
更新 ludu-module-datacenter/ludu-module-datacenter-biz/run.sh
continuous-integration/drone Build is passing
|
2025-01-26 11:24:14 +08:00 |
|
|
|
a2999aaa9d
|
更新 ludu-module-datacenter/ludu-module-datacenter-biz/run.sh
continuous-integration/drone Build is passing
|
2025-01-26 11:11:23 +08:00 |
|
|
|
1d49803ab6
|
Merge pull request '票务服务查省份售票数据添加身份证判空' (#104) from cgt into master
continuous-integration/drone Build is passing
Reviewed-on: #104
|
2025-01-26 10:55:09 +08:00 |
|
punchhhh
|
021f9680de
|
票务服务查省份售票数据添加身份证判空
|
2025-01-26 10:36:20 +08:00 |
|
|
|
7a1e03a8cd
|
Merge pull request '修改票务服务节假日数据和历年数据接口' (#103) from cgt into master
Reviewed-on: #103
|
2025-01-26 09:33:26 +08:00 |
|
punchhhh
|
e4473a7121
|
修改票务服务节假日数据数据对象
|
2025-01-26 09:30:37 +08:00 |
|
punchhhh
|
57303f6a0c
|
修改票务服务节假日数据和历年数据接口
|
2025-01-26 09:28:12 +08:00 |
|
|
|
3d6103ab62
|
Merge pull request '区域树分页查询添加cameraName条件参数 添加节假日售票统计接口' (#102) from cgt into master
Reviewed-on: #102
|
2025-01-25 11:09:27 +08:00 |
|
punchhhh
|
0ceebfdfb3
|
区域树分页查询添加cameraName条件参数
添加节假日售票统计接口
|
2025-01-24 17:44:23 +08:00 |
|
|
|
4bfb81d928
|
更新 ludu-module-hiking/ludu-module-hiking-biz/Dockerfile
|
2025-01-24 14:02:18 +08:00 |
|
|
|
d24075b1df
|
Merge pull request '添加hiking服务远程调用接口 修改当前datacenter为调用远程服务 补充service实现类' (#101) from cgt into master
Reviewed-on: #101
|
2025-01-24 13:43:10 +08:00 |
|
punchhhh
|
ebba496e0c
|
添加hiking服务远程调用接口 修改当前datacenter为调用远程服务 补充service实现类
|
2025-01-24 13:41:26 +08:00 |
|
|
|
c08334e3e1
|
Merge pull request '添加hiking服务远程调用接口 修改当前datacenter为调用远程服务' (#100) from cgt into master
Reviewed-on: #100
|
2025-01-24 13:10:37 +08:00 |
|
punchhhh
|
c1b453b487
|
添加hiking服务远程调用接口 修改当前datacenter为调用远程服务
|
2025-01-24 12:26:09 +08:00 |
|
|
|
289f22c109
|
Merge pull request '更改CameraApi 和RegionApi的包' (#99) from cgt into master
Reviewed-on: #99
|
2025-01-23 18:15:18 +08:00 |
|
punchhhh
|
4f0d793cd4
|
更改CameraApi 和RegionApi的包
|
2025-01-23 18:14:25 +08:00 |
|
|
|
0968a1e6ba
|
Merge pull request '更改docker build命令' (#98) from cgt into master
Reviewed-on: #98
|
2025-01-23 15:39:07 +08:00 |
|
punchhhh
|
a8ee63a0f3
|
更改docker build命令
|
2025-01-23 15:11:04 +08:00 |
|
|
|
9dd7d020e5
|
Merge pull request '更改spring.profiles.active为dev 更改docker build' (#97) from cgt into master
Reviewed-on: #97
|
2025-01-23 15:08:43 +08:00 |
|
punchhhh
|
f378ab15be
|
更改spring.profiles.active为dev 更改docker build
|
2025-01-23 15:07:08 +08:00 |
|
|
|
6735c0b9b8
|
Merge pull request '补充票务服务缺少的接口' (#96) from cgt into master
Reviewed-on: #96
|
2025-01-23 13:41:43 +08:00 |
|
punchhhh
|
3b80e3b72a
|
补充票务服务缺少的接口
|
2025-01-23 13:40:48 +08:00 |
|
|
|
d2dd26adfa
|
Merge pull request 'hiking模块修改pom repackage更改构建的jar包名' (#95) from cgt into master
Reviewed-on: #95
|
2025-01-23 11:02:11 +08:00 |
|
punchhhh
|
20e2e387b9
|
hiking模块修改pom repackage更改构建的jar包名
|
2025-01-23 10:59:40 +08:00 |
|
|
|
8969526dc5
|
更新 .drone.yml
|
2025-01-23 10:36:46 +08:00 |
|
|
|
8240b73edc
|
Merge pull request 'hiking模块修改pom parent version为${revision}' (#94) from cgt into master
Reviewed-on: #94
|
2025-01-23 10:24:30 +08:00 |
|
punchhhh
|
5e42821ce1
|
hiking模块修改pom parent version为${revision}
|
2025-01-23 10:22:50 +08:00 |
|
|
|
d20fb90480
|
Merge pull request 'hiking模块和datacenter补充提交' (#93) from cgt into master
continuous-integration/drone Build was killed
Reviewed-on: #93
|
2025-01-23 10:10:39 +08:00 |
|
punchhhh
|
789fb438c8
|
hiking模块和datacenter补充提交
|
2025-01-23 10:09:43 +08:00 |
|
|
|
3d06faa9d8
|
Merge pull request '海康接口数据获取类修改了配置 增加了一个售票接口用于获取某日售票情况' (#92) from cgt into master
Reviewed-on: #92
|
2025-01-23 10:01:46 +08:00 |
|
punchhhh
|
01e2a51b57
|
海康接口数据获取类修改了配置 增加了一个售票接口用于获取某日售票情况
|
2025-01-23 09:58:07 +08:00 |
|
|
|
2c92857cf1
|
更新 .drone-hiking.yml
continuous-integration/drone Build is passing
|
2025-01-22 16:50:18 +08:00 |
|
|
|
09608a03b7
|
添加 ludu-module-hiking/ludu-module-hiking-biz/run.sh
|
2025-01-22 16:45:11 +08:00 |
|
|
|
1ebcb40796
|
添加 ludu-module-hiking/ludu-module-hiking-biz/Dockerfile
|
2025-01-22 16:39:42 +08:00 |
|
|
|
a3931099be
|
添加 .drone-hiking
|
2025-01-22 16:36:56 +08:00 |
|
|
|
a38a2c49aa
|
Merge pull request '海康服务模块补充 修改接口参数' (#91) from cgt into master
continuous-integration/drone Build is passing
Reviewed-on: #91
|
2025-01-22 11:47:26 +08:00 |
|
punchhhh
|
aebdb97cee
|
海康服务模块补充
|
2025-01-22 09:38:28 +08:00 |
|
punchhhh
|
8b696e1ce2
|
海康服务后台模块 获取资源工具类
|
2025-01-22 09:06:17 +08:00 |
|
|
|
1b9365e558
|
Merge pull request '添加海康接口 优化票务服务' (#90) from cgt into master
Reviewed-on: #90
|
2025-01-22 09:03:15 +08:00 |
|
punchhhh
|
7174c59e8e
|
海康服务后台模块
|
2025-01-22 09:00:31 +08:00 |
|
punchhhh
|
48a6241a42
|
添加海康接口 优化票务服务
|
2025-01-21 21:01:21 +08:00 |
|
|
|
fb038b16d0
|
'售票按性别统计数量 增加身份证为空的处理' 添加海康接口 优化票务接口
'售票按性别统计数量 增加身份证为空的处理' 添加海康接口 优化票务接口
|
2025-01-21 20:45:41 +08:00 |
|
punchhhh
|
31378273e1
|
Merge remote-tracking branch 'origin/cgt' into cgt
|
2025-01-21 20:43:39 +08:00 |
|
punchhhh
|
2a7e798917
|
添加海康接口 优化票务服务
|
2025-01-21 20:41:52 +08:00 |
|
|
|
bebc3ac904
|
revert c47e0f0ffc
revert 添加海康接口 优化票务服务
|
2025-01-21 20:39:38 +08:00 |
|
punchhhh
|
c47e0f0ffc
|
添加海康接口 优化票务服务
|
2025-01-21 20:37:50 +08:00 |
|
punchhhh
|
2163c4482c
|
Merge remote-tracking branch 'origin/cgt' into cgt
# Conflicts:
# ludu-module-datacenter/ludu-module-datacenter-biz/src/main/java/cn/iocoder/yudao/module/datacenter/controller/CameraApi.java
# ludu-module-datacenter/ludu-module-datacenter-biz/src/main/java/cn/iocoder/yudao/module/datacenter/controller/app/camera/vo/CameraDO.java
# ludu-module-datacenter/ludu-module-datacenter-biz/src/main/java/cn/iocoder/yudao/module/datacenter/controller/app/camera/vo/CameraDTO.java
# ludu-module-datacenter/ludu-module-datacenter-biz/src/main/java/cn/iocoder/yudao/module/datacenter/controller/app/camera/vo/CameraPageReqVO.java
# ludu-module-datacenter/ludu-module-datacenter-biz/src/main/java/cn/iocoder/yudao/module/datacenter/controller/app/camera/vo/CameraRespVO.java
# ludu-module-datacenter/ludu-module-datacenter-biz/src/main/java/cn/iocoder/yudao/module/datacenter/controller/app/camera/vo/CameraSaveReqVO.java
# ludu-module-datacenter/ludu-module-datacenter-biz/src/main/java/cn/iocoder/yudao/module/datacenter/dal/mysql/camera/CameraMapper.java
# ludu-module-datacenter/ludu-module-datacenter-biz/src/main/java/cn/iocoder/yudao/module/datacenter/service/camera/CameraService.java
# ludu-module-datacenter/ludu-module-datacenter-biz/src/main/java/cn/iocoder/yudao/module/datacenter/service/camera/CameraServiceImpl.java
|
2025-01-21 20:22:57 +08:00 |
|
