Commit Graph

246 Commits

Author SHA1 Message Date
liang.chao 4029e29e2d 订单状态统一修改 2024-12-01 13:23:19 +08:00
liang.chao 092cdeb03c 订单状态统一修改 2024-12-01 12:52:51 +08:00
liang.chao 6c76126020 订单状态统一修改 2024-12-01 12:52:37 +08:00
liang.chao bec91aac8a 订单状态统一修改 2024-12-01 12:41:36 +08:00
liang.chao 7d4bc94b35 订单状态统一修改 2024-12-01 12:34:31 +08:00
liang.chao cccf463b36 订单状态统一修改 2024-12-01 12:31:25 +08:00
liang.chao c0960719db 订单状态统一修改 2024-12-01 12:28:14 +08:00
liang.chao 586aa21b41 订单状态统一修改 2024-12-01 12:01:48 +08:00
liang.chao 65ad64a465 订单状态统一修改 2024-12-01 11:49:59 +08:00
liang.chao 5ec647ac8a 库存修改 2024-11-29 18:07:06 +08:00
liang.chao 3c6c69d31c Merge remote-tracking branch 'origin/master' 2024-11-29 10:41:16 +08:00
liang.chao f9e9dd3286 分页bug修改 2024-11-29 10:41:05 +08:00
mashuai ef367f4d2c 接口联调 2024-11-28 18:54:31 +08:00
mashuai 2738a8912d 接口联调 2024-11-28 18:17:12 +08:00
syruan 356bf9b5e9 字段格式化取消 2024-11-28 17:51:07 +08:00
liang.chao 791257c768 订单详情时间类型修改 2024-11-28 17:06:17 +08:00
liang.chao 8f527398ba 订单状态流转代码提交 2024-11-28 16:18:34 +08:00
liang.chao 6915a269d0 Merge remote-tracking branch 'origin/master' 2024-11-28 16:06:47 +08:00
liang.chao 7e39dbd592 订单状态流转代码提交 2024-11-28 16:06:43 +08:00
mashuai d674b880e7 租赁需求大厅 2024-11-28 15:53:12 +08:00
liang.chao 108adcd1b8 订单状态流转代码提交 2024-11-28 15:21:48 +08:00
liang.chao d6cab8ecd7 订单状态流转代码提交 2024-11-28 15:12:24 +08:00
liang.chao c9bf3a817c 订单状态流转代码提交 2024-11-28 13:33:51 +08:00
liang.chao d23d2c74e7 订单状态流转代码提交 2024-11-28 11:24:03 +08:00
liang.chao e16dcb5eaa Merge remote-tracking branch 'origin/master' 2024-11-28 11:06:56 +08:00
liang.chao f1f39cfa56 逻辑修改 2024-11-28 11:06:51 +08:00
15856 d4d99c5c94 优化购物车展示 2024-11-28 10:48:24 +08:00
liang.chao 0cbe4c46ba 订单外层状态修改 2024-11-28 10:45:39 +08:00
liang.chao f981612884 字段修改 2024-11-28 10:09:00 +08:00
mashuai 1a69288d3b 租赁需求大厅 2024-11-27 18:20:32 +08:00
liang.chao 2133159088 Merge remote-tracking branch 'origin/master' 2024-11-27 17:47:24 +08:00
liang.chao 5e5967baad 商品上下架和删除bug修改 2024-11-27 17:47:20 +08:00
mashuai 0e344682ec 租赁需求大厅 2024-11-27 17:29:15 +08:00
sxu f52fae9613 类型管理 2024-11-27 17:12:07 +08:00
sxu 73463689be Merge remote-tracking branch 'origin/master' 2024-11-27 17:04:47 +08:00
sxu aa1eed41d9 类型管理 2024-11-27 17:03:03 +08:00
sxu 23a4edc63f 类型管理 2024-11-27 16:50:21 +08:00
liang.chao 5637f67208 订单查询接口代码提交 2024-11-27 15:13:29 +08:00
liang.chao 82a3e6b8c6 订单查询接口代码提交 2024-11-27 14:41:09 +08:00
liang.chao 5860a91201 订单查询接口代码提交 2024-11-27 14:39:58 +08:00
liang.chao d2a0936633 订单查询接口代码提交 2024-11-27 14:11:34 +08:00
liang.chao 950d1bc3e9 订单查询接口代码提交 2024-11-27 11:27:40 +08:00
liang.chao 2af1f91199 订单查询接口代码提交 2024-11-27 10:45:22 +08:00
liang.chao b0cef39f42 订单查询接口代码提交 2024-11-27 10:41:27 +08:00
liang.chao c6a25b49ca 订单查询接口代码提交 2024-11-27 10:38:32 +08:00
liang.chao b176256ed3 订单查询接口代码提交 2024-11-27 10:06:53 +08:00
15856 aa464f1a45 加入购物车以及详情展示优化 2024-11-26 18:55:15 +08:00
mashuai a7feb390c8 bug 2024-11-26 18:08:43 +08:00
mashuai 1972ee4afd Merge remote-tracking branch 'origin/master' 2024-11-26 17:52:45 +08:00
liang.chao 6432a0c004 购物车提交和订单查询接口 2024-11-26 17:52:44 +08:00
mashuai 5710939573 优化 2024-11-26 17:52:41 +08:00
mashuai 62c81d8fa0 优化 2024-11-26 16:52:35 +08:00
mashuai 2bd1fbf4e5 优化 2024-11-26 16:18:57 +08:00
15856 e1da9881c8 热搜装备新增公司id 2024-11-26 15:29:06 +08:00
mashuai 8099c6ada3 详情 2024-11-26 13:45:04 +08:00
mashuai 743cc1f17b Merge remote-tracking branch 'origin/master' 2024-11-26 13:41:05 +08:00
mashuai 92cae12061 详情 2024-11-26 13:41:00 +08:00
15856 2b752442f3 立即承租 2024-11-26 13:27:23 +08:00
15856 32e17988ae 立即承租 2024-11-26 11:27:44 +08:00
15856 c862054a42 Merge remote-tracking branch 'origin/master' 2024-11-26 11:16:18 +08:00
mashuai 6eea48f7a9 Merge remote-tracking branch 'origin/master' 2024-11-26 11:16:01 +08:00
15856 eb96ef8093 立即承租 2024-11-26 11:15:54 +08:00
mashuai 4f25add46b 优化 2024-11-26 11:15:51 +08:00
syruan 5f7f5c707b 增加注释 2024-11-26 11:07:09 +08:00
mashuai 01de2f4cbc 删除预约车 2024-11-26 10:59:41 +08:00
mashuai 7484683d3a 装备共享大厅联调 2024-11-26 10:25:17 +08:00
syruan 8002f8143f 物资装备SQL修改 2024-11-26 09:48:08 +08:00
syruan 0928f68f6a 物资装备SQL修改 2024-11-26 09:06:39 +08:00
syruan aa3278f2ca 物资装备条件筛选、装备上下架逻辑、草稿状态定义 2024-11-25 17:43:14 +08:00
mashuai 9409c65920 装备共享大厅联调 2024-11-25 16:26:46 +08:00
mashuai 7df56e43cc 装备共享大厅 2024-11-25 14:46:39 +08:00
liang.chao baf144e412 设备上下架功能 2024-11-23 17:43:19 +08:00
mashuai 16c608f99e 添加预约车功能及列表查询 2024-11-23 17:15:01 +08:00
syruan 8555949ed7 物资装备代码合并 2024-11-23 15:36:02 +08:00
mashuai 2be1e0098d 首页装备搜索 2024-11-23 14:43:08 +08:00
liang.chao 11c9f3a423 冲突还原 2024-11-23 13:30:20 +08:00
liang.chao 8997b8df54 Merge remote-tracking branch 'origin/master' 2024-11-23 13:27:26 +08:00
liang.chao 88b969449c 设备管理代码修改 2024-11-23 13:26:26 +08:00
mashuai 61142f74bd 首页装备搜索 2024-11-23 12:49:14 +08:00
liang.chao f42484d685 代码还原 2024-11-23 11:44:49 +08:00
liang.chao 4576c616d6 设备新增修改 2024-11-23 11:42:53 +08:00
liang.chao ca2f94b2c7 Merge remote-tracking branch 'origin/master'
# Conflicts:
#	bonus-modules/bonus-material-mall/src/main/resources/mapper/material/device/DevInfoMapper.xml
2024-11-23 11:41:06 +08:00
liang.chao d04607ff31 设备新增修改 2024-11-23 11:40:06 +08:00
sxu 1e8b609d9b add repeat annotation 2024-11-22 19:37:48 +08:00
mashuai 8396aaa448 最新装备 2024-11-22 18:03:53 +08:00
liang.chao bca4e13ada Merge remote-tracking branch 'origin/master' 2024-11-22 17:41:35 +08:00
liang.chao 3069840dd5 预约车功能开发 2024-11-22 17:41:27 +08:00
mashuai 08ba98d4f6 热搜装备 2024-11-22 17:41:13 +08:00
syruan 4a3009366d 物资类型提取,控制器修改 2024-11-22 13:47:36 +08:00
mashuai 37ac0556e8 首页类目搜索 2024-11-22 13:04:43 +08:00
syruan f83de238b6 设备信息,字典domain 2024-11-22 11:12:06 +08:00
sxu 0079778d3a Merge remote-tracking branch 'origin/master' 2024-11-22 10:37:06 +08:00
syruan 5d7d542b9c 设备信息,字典domain 2024-11-22 10:16:54 +08:00
mashuai 55fe18c5f2 配置文件 2024-11-22 09:39:07 +08:00
sxu aaef3af05b add profile 2024-11-22 08:19:39 +08:00
sxu 1652eac0c5 first commit 2024-11-20 19:03:03 +08:00