Commit Graph

338 Commits

Author SHA1 Message Date
jjLv 64b67b2576 Merge branch 'hongchao-dev' 2024-11-28 18:40:23 +08:00
jjLv c8bae06b80 订单样式 2024-11-28 18:39:53 +08:00
zzyuan 525e5511f5 Merge branch 'main' of http://192.168.0.56:3000/bonus/Zlpt_Portal 2024-11-28 18:29:04 +08:00
zzyuan 2ee19e7551 装备草稿接口对接 2024-11-28 18:28:01 +08:00
jjLv 2d85f94e76 Merge branch 'hongchao-dev' 2024-11-28 18:06:06 +08:00
jjLv 29bc0bdb6f 所有的订单管理页面 2024-11-28 18:02:43 +08:00
zzyuan b662406c55 个人中心菜单管理 2024-11-28 17:41:16 +08:00
zzyuan 932e8edf7c 订单修改装备列表修改 2024-11-28 17:35:25 +08:00
BianLzhaoMin 39ccd71c22 提交 2024-11-28 15:11:51 +08:00
BianLzhaoMin 7af1325358 提交 2024-11-28 15:11:43 +08:00
BianLzhaoMin 2d18d62583 需求大厅功能初步完善 2024-11-28 15:11:08 +08:00
jjLv 0b7fe3c0a2 出租方订单页面以及订单详情 2024-11-28 13:43:25 +08:00
jjLv b083418ff9 冲突解决 2024-11-28 10:22:38 +08:00
jjLv 50a700fd9e 冲突 2024-11-28 10:15:48 +08:00
jjLv 5a73080675 冲突 2024-11-28 10:14:15 +08:00
jjLv 84f63f55cf Merge branch 'hongchao-dev' 2024-11-28 10:13:44 +08:00
jjLv 892df1aea0 页面错误解决 2024-11-28 10:10:17 +08:00
BianLzhaoMin 078f56595f 冲突合并 2024-11-28 10:04:51 +08:00
BianLzhaoMin c6577dd0b9 冲突合并 2024-11-28 10:04:04 +08:00
jjLv 44443120a9 冲突合并 2024-11-28 10:01:37 +08:00
jjLv 4e74fc94b9 代码提交 2024-11-28 09:58:50 +08:00
BianLzhaoMin 00157903c5 Merge branch 'main' of http://192.168.0.56:3000/bonus/Zlpt_Portal 2024-11-28 09:53:24 +08:00
jjLv ac9ff61624 代码提交 2024-11-28 09:52:59 +08:00
BianLzhaoMin 0592ff5ea1 需求大厅开发 2024-11-28 09:29:25 +08:00
BianLzhaoMin 71ec17b97a 冲突合并 2024-11-28 09:01:52 +08:00
BianLzhaoMin 9c80be269e 提交 2024-11-28 08:59:47 +08:00
BianLzhaoMin d44bb19d90 样式等问题优化 2024-11-28 08:59:34 +08:00
jjLv 2c1dfcc49d 订单页面退租检修,费用结算按钮页面 2024-11-28 08:51:43 +08:00
BianLzhaoMin 55d20a391a 提交 2024-11-27 18:23:16 +08:00
BianLzhaoMin 8e2bdd4354 Merge branch 'dev-sy' 2024-11-27 18:23:07 +08:00
BianLzhaoMin 0c70fbdac4 需求列表功能完善 2024-11-27 18:22:35 +08:00
liang.chao 89fa822ca5 商品上下架和删除bug修改 2024-11-27 17:44:58 +08:00
jjLv d3d3907eb2 订单详情 2024-11-27 17:12:33 +08:00
BianLzhaoMin f73ff35633 Merge branch 'dev-sy' 2024-11-27 16:57:14 +08:00
BianLzhaoMin a8a64b1056 冲突合并 2024-11-27 16:56:38 +08:00
BianLzhaoMin dcd1a9fd53 提交 2024-11-27 16:56:26 +08:00
BianLzhaoMin a876914ce1 需求管理页面完善 2024-11-27 16:56:15 +08:00
jjLv 3e9ad09a28 Merge branch 'main' of http://192.168.0.56:3000/bonus/Zlpt_Portal 2024-11-27 16:48:53 +08:00
jjLv 90e58531c2 出租方订单详情 2024-11-27 16:47:47 +08:00
BianLzhaoMin fa64aa1dfc 冲突合并 2024-11-27 15:19:35 +08:00
BianLzhaoMin 3c60789c2c 冲突合并 2024-11-27 15:19:11 +08:00
BianLzhaoMin 8725fe5796 冲突合并 2024-11-27 15:17:34 +08:00
BianLzhaoMin d3f9ddc80a 提交 2024-11-27 15:17:10 +08:00
BianLzhaoMin 97349aaec8 寻源需求页面初步完善 2024-11-27 15:16:53 +08:00
zzyuan a29e449ebe Merge branch 'main' of http://192.168.0.56:3000/bonus/Zlpt_Portal 2024-11-27 14:39:57 +08:00
zzyuan 6c29ad4446 装备列表 2024-11-27 14:39:19 +08:00
jjLv c3f06d18ee 承租订单详情 2024-11-27 12:57:02 +08:00
jjLv 8c47679c4a 承租订单管理 2024-11-27 11:33:19 +08:00
zzyuan deaaa5508b 合并冲突 2024-11-27 10:07:32 +08:00
zzyuan 0035d60f3d Merge branch 'main' of http://192.168.0.56:3000/bonus/Zlpt_Portal 2024-11-27 10:07:07 +08:00