Commit Graph

529 Commits

Author SHA1 Message Date
binbin_pan b3755db6a7 优化 2024-12-26 13:57:12 +08:00
BianLzhaoMin d86c8b4b33 消息逻辑完善 2024-12-25 14:24:34 +08:00
BianLzhaoMin 4f947e09b1 Merge branch 'main' into dev-sy-12-23 2024-12-25 08:53:31 +08:00
BianLzhaoMin 022c394b3b 统一登录问题调试 2024-12-25 08:52:58 +08:00
hongchao 9b2b73ae17 合同模板新增 2024-12-24 10:35:00 +08:00
BianLzhaoMin ac72bc580f 页面样式问题优化 2024-12-23 14:19:13 +08:00
BianLzhaoMin 760abfd218 Merge branch 'main' into dev-sy-12-23 2024-12-23 13:53:14 +08:00
BianLzhaoMin 433c04463b 样式等问题优化 2024-12-23 13:52:38 +08:00
hongchao 110de9301f 消息通知(未完成) 2024-12-23 13:36:03 +08:00
hongchao 976c933788 质检bug修复 2024-12-23 11:07:01 +08:00
hongchao 57bb23c926 bug修复12/23 2024-12-23 10:54:39 +08:00
hongchao 031102bec8 bug修复 2024-12-20 20:19:21 +08:00
hongchao 9b4d32420f bug修复 2024-12-20 19:20:29 +08:00
hongchao 1decab330c bug修复 2024-12-20 18:13:47 +08:00
hongchao 21946389ea Merge branch 'main' of http://192.168.0.56:3000/bonus/Zlpt_Portal 2024-12-20 17:58:08 +08:00
hongchao 3518ba8398 bug修复 2024-12-20 17:54:25 +08:00
BianLzhaoMin 02c97e4c39 Merge branch 'main' into dev-sy 2024-12-20 17:36:51 +08:00
BianLzhaoMin a2824f157f 问题清单修复 2024-12-20 17:36:14 +08:00
hongchao 30db2836f6 bug修复 2024-12-20 17:20:37 +08:00
hongchao faa7a61755 装备新增优化 2024-12-20 16:42:24 +08:00
hongchao a1df56f610 时间bug修复 2024-12-20 16:25:32 +08:00
hongchao 04910ecaa9 bug修复 2024-12-20 16:00:38 +08:00
hongchao 04e9f29efb tableList修改 2024-12-20 15:08:43 +08:00
hongchao ea1926121e 装备新增bug 2024-12-20 15:05:20 +08:00
hongchao 48b4d6aab6 bug修复 2024-12-20 14:10:16 +08:00
hongchao 460bc81aaf bug修复 2024-12-20 08:47:20 +08:00
hongchao d614f87355 Merge branch 'main' of http://192.168.0.56:3000/bonus/Zlpt_Portal 2024-12-19 16:46:54 +08:00
hongchao 0511ebef27 上传文件名加密 2024-12-19 16:46:48 +08:00
BianLzhaoMin 52f7781c5f 优化 2024-12-19 16:04:58 +08:00
BianLzhaoMin 65e9f8b574 更换首页路由地址 2024-12-19 16:01:16 +08:00
hongchao af28fdfd86 预约车加电话 2024-12-19 15:36:57 +08:00
hongchao 758e17ea22 关联装备优化 2024-12-19 10:49:19 +08:00
hongchao c37a64e9e7 装备属性优化 2024-12-18 14:49:44 +08:00
BianLzhaoMin 488ce70086 代码优化 2024-12-18 13:11:40 +08:00
BianLzhaoMin 23adf1910e 问题清单修复 2024-12-18 12:18:40 +08:00
hongchao c7ef2d12d1 Merge branch 'main-1218' 2024-12-18 10:35:12 +08:00
hongchao ecd0f2e9e7 协议合并 2024-12-18 10:34:37 +08:00
BianLzhaoMin 6eb6817f77 问题修复 2024-12-18 09:51:09 +08:00
BianLzhaoMin 02d0428a15 问题清单修复 2024-12-18 09:30:55 +08:00
BianLzhaoMin 5a26725c0c 富文本样式问题修复 2024-12-18 09:00:29 +08:00
BianLzhaoMin f7929a7f35 问题清单修复 2024-12-17 20:58:36 +08:00
BianLzhaoMin 7dadc7620a 修复预约车问题 2024-12-17 20:24:26 +08:00
BianLzhaoMin 8629efd0c1 代码修复 2024-12-17 20:15:51 +08:00
BianLzhaoMin b5655fd802 问题清单修复 2024-12-17 20:09:25 +08:00
BianLzhaoMin 5c96cde5ce 合同上传问题处理 2024-12-17 19:06:27 +08:00
BianLzhaoMin 6ade028464 代码优化 2024-12-17 18:56:22 +08:00
hongchao 8480ef8734 Merge branch 'main' of http://192.168.0.56:3000/bonus/Zlpt_Portal 2024-12-17 17:41:42 +08:00
BianLzhaoMin 1d63519be0 订单增加编号字段 2024-12-17 17:26:17 +08:00
hongchao 43d8bc3ec0 Merge branch 'hongchao-dev' 2024-12-17 16:45:48 +08:00
hongchao 432e7de74f 合同管理 2024-12-17 16:45:10 +08:00
BianLzhaoMin 6d182a00fc 问题清单修复 2024-12-17 16:21:09 +08:00
BianLzhaoMin f2cc3f0df6 Merge branch 'main' into dev-sy 2024-12-17 15:55:40 +08:00
BianLzhaoMin 560e324e6c 问题清单修复 2024-12-17 15:55:18 +08:00
hongchao 355ec0b2e3 Merge branch 'hongchao-dev' 2024-12-17 15:51:15 +08:00
hongchao d3643e3d58 合同管理 2024-12-17 15:48:08 +08:00
BianLzhaoMin 84e1008311 富文本编辑器初始化 2024-12-17 14:19:55 +08:00
BianLzhaoMin 9c0a8c86a7 优化个人中心跳转问题 2024-12-17 13:41:03 +08:00
BianLzhaoMin d71cab20de 问题清单修复 2024-12-17 13:31:42 +08:00
BianLzhaoMin 804d178710 代码提交 2024-12-17 13:01:52 +08:00
BianLzhaoMin 0c0765ed6e 冲突合并 2024-12-17 10:58:32 +08:00
BianLzhaoMin a2da73df83 问题清单修复 2024-12-17 10:57:09 +08:00
hongchao 89aceec8fd Merge branch 'hongchao-dev' 2024-12-17 10:54:48 +08:00
hongchao 50ff159e2b 合同管理 2024-12-17 10:54:03 +08:00
BianLzhaoMin af2dfc90d0 Merge branch 'dev-sy' 2024-12-16 18:38:18 +08:00
BianLzhaoMin 951969a184 预约车地址增加 2024-12-16 18:37:54 +08:00
hongchao 66d0cac1a4 Merge branch 'hongchao-dev' 2024-12-16 18:36:13 +08:00
hongchao 640ef4c3b3 装备新增不过修复 2024-12-16 18:35:51 +08:00
BianLzhaoMin 33b004bbe3 Merge branch 'main' into dev-sy 2024-12-16 18:16:13 +08:00
BianLzhaoMin 98d2bce89c 问题清单修复 2024-12-16 18:15:47 +08:00
hongchao 2ebfb6c9ef 冲突处理 2024-12-16 18:08:34 +08:00
hongchao 4f260c5da3 Merge branch 'hongchao-dev' 2024-12-16 18:07:04 +08:00
hongchao 24b016d69d 租赁协议 2024-12-16 17:57:28 +08:00
BianLzhaoMin 9003ac1b3c 问题清单修复 2024-12-16 17:50:28 +08:00
BianLzhaoMin 3a18b18490 问题清单修复 2024-12-16 17:04:41 +08:00
BianLzhaoMin a854312c1b 问题清单修复 2024-12-16 15:45:48 +08:00
BianLzhaoMin 8d2d9bf7ad 冲突合并 2024-12-16 13:08:34 +08:00
BianLzhaoMin 0e8caf2c7c 地址管理增加 2024-12-16 13:06:54 +08:00
jjLv 1baeed8e2e 合同管理状态改变 2024-12-13 18:14:22 +08:00
BianLzhaoMin 228eebbb75 装备上传图片大小调整 2024-12-13 17:25:12 +08:00
BianLzhaoMin c9cfa1abab 调试二维码显示问题 2024-12-13 16:02:35 +08:00
BianLzhaoMin 95b51eed2c Merge branch 'main' into dev-sy 2024-12-13 15:46:22 +08:00
BianLzhaoMin 3a0fc4e226 代码优化 2024-12-13 15:46:07 +08:00
jjLv 4c336c4c61 Merge branch 'hongchao-dev' 2024-12-13 15:23:52 +08:00
jjLv e1ef646627 合同管理 2024-12-13 15:23:21 +08:00
BianLzhaoMin 3a36987c6b 代码优化 2024-12-13 13:23:21 +08:00
BianLzhaoMin 90438b3da9 代码优化 2024-12-13 13:20:31 +08:00
BianLzhaoMin c8e0252ab6 代码优化 2024-12-13 13:16:10 +08:00
BianLzhaoMin 902b513e05 代码优化 2024-12-13 10:33:48 +08:00
BianLzhaoMin 56c81605a6 bug修复 2024-12-13 10:26:42 +08:00
BianLzhaoMin 648e8b6ea9 代码优化 2024-12-13 10:20:22 +08:00
BianLzhaoMin 450285177c 维修功能开发 代码优化 2024-12-12 18:03:33 +08:00
BianLzhaoMin ca2b907669 Merge branch 'main' into dev-sy 2024-12-12 15:32:45 +08:00
jjLv fd88bcbdc3 Merge branch 'main' of http://192.168.0.56:3000/bonus/Zlpt_Portal 2024-12-12 15:31:47 +08:00
BianLzhaoMin f6237bd741 标签页面完善 2024-12-12 15:30:21 +08:00
BianLzhaoMin 26823d5cb8 订单流程完善 2024-12-12 14:18:51 +08:00
jjLv d3fce3af52 Merge branch 'hongchao-dev' 2024-12-12 10:58:53 +08:00
jjLv 69d3d249ed 装备详情添加属性 2024-12-12 10:58:12 +08:00
BianLzhaoMin 477f48e23f 代码优化 2024-12-12 09:13:37 +08:00
BianLzhaoMin 21404d22f6 代码优化 2024-12-12 09:10:46 +08:00
BianLzhaoMin 7c9729f8f4 优化 2024-12-12 09:04:24 +08:00
BianLzhaoMin 33ba6cb863 Merge branch 'main' into dev-sy 2024-12-11 18:10:45 +08:00
BianLzhaoMin 0a7f44b847 订单状态合并 2024-12-11 18:09:31 +08:00
jjLv 871fa7ff27 装备新增属性必填 2024-12-11 18:09:23 +08:00
BianLzhaoMin d288f3131f 承租方订单页面优化 2024-12-11 16:10:20 +08:00
jjLv 19b2b4cc10 Merge branch 'hongchao-dev' 2024-12-11 16:06:24 +08:00
jjLv 84760ba32c 装备新增属性 2024-12-11 16:05:45 +08:00
BianLzhaoMin 9c3ae0bc5a Merge branch 'main' into dev-sy 2024-12-11 13:08:36 +08:00
BianLzhaoMin 0f04e449aa 代码优化 2024-12-11 09:55:14 +08:00
jjLv 57468d35b3 Merge branch 'hongchao-dev' 2024-12-11 09:28:28 +08:00
jjLv 31ffdd2b3c 合同管理 2024-12-11 09:27:49 +08:00
BianLzhaoMin 794720124d 代码完善 2024-12-11 09:13:14 +08:00
jjLv c4a6e9d71f Merge branch 'hongchao-dev' 2024-12-10 18:48:07 +08:00
jjLv 01850eaadc 属性重复bug修复 2024-12-10 18:47:44 +08:00
jjLv a1cfcb7e47 Merge branch 'hongchao-dev' 2024-12-10 18:35:09 +08:00
jjLv 8d701b7730 bug修复 2024-12-10 18:31:21 +08:00
jjLv 8643c87a71 查看,编辑属性 2024-12-10 18:12:15 +08:00
jjLv 5cdcd2f9bf 查看,编辑属性 2024-12-10 17:40:07 +08:00
jjLv 3e6738de6e 新增属性 2024-12-10 17:13:39 +08:00
jjLv 21ea680a38 新增属性 2024-12-10 17:01:47 +08:00
liang.chao 5729acf0b3 1 2024-12-10 15:56:12 +08:00
BianLzhaoMin 9bdae9d218 代码优化 2024-12-10 15:06:36 +08:00
BianLzhaoMin 076644e4f6 安全证书功能完善 2024-12-10 14:02:33 +08:00
BianLzhaoMin 6da92a3154 代码优化 2024-12-09 17:27:43 +08:00
BianLzhaoMin 0277edbe2d 质检管理功能开发 2024-12-09 17:21:46 +08:00
BianLzhaoMin acc00f3887 代码优化 2024-12-09 13:10:06 +08:00
BianLzhaoMin 6792becdbb 代码优化 2024-12-09 09:38:06 +08:00
BianLzhaoMin 68e431eb43 代码优化 2024-12-08 20:40:59 +08:00
BianLzhaoMin 0eec51d1e0 Merge branch 'dev-sy' 2024-12-06 21:27:44 +08:00
BianLzhaoMin 2b64c9d951 代码提交 2024-12-06 21:26:37 +08:00
BianLzhaoMin 3eae5482ee Merge branch 'dev-sy' 2024-12-06 21:02:44 +08:00
BianLzhaoMin 9df856613b 代码优化 2024-12-06 21:02:34 +08:00
BianLzhaoMin 14487ab37d 装备新增问题修复 2024-12-06 19:25:03 +08:00
BianLzhaoMin ef38e30bfe Merge branch 'dev-sy' 2024-12-06 17:53:49 +08:00
BianLzhaoMin 14cc1b3710 增加轮播图 2024-12-06 17:53:35 +08:00
BianLzhaoMin ed0e33e9fb Merge branch 'dev-sy' 2024-12-06 17:49:10 +08:00
BianLzhaoMin 141a763be1 装备新增逻辑完善 2024-12-06 17:48:56 +08:00
mashuai 6eb7329ee4 字段调整 2024-12-06 17:28:06 +08:00
liang.chao 0df9d457db 装备设备状态查询bug修改 2024-12-06 16:44:48 +08:00
BianLzhaoMin 421445f924 结算逻辑完善 2024-12-05 18:12:07 +08:00
BianLzhaoMin c665c32553 Merge branch 'dev-sy' 2024-12-05 16:58:48 +08:00
BianLzhaoMin a6568d208b 增加文件下载功能 2024-12-05 16:58:35 +08:00
liang.chao 2185be3542 模板下载 2024-12-05 16:54:22 +08:00
BianLzhaoMin c9316f53b0 Merge branch 'dev-sy' 2024-12-05 16:33:27 +08:00
BianLzhaoMin 37a7884a9a 代码优化提交 2024-12-05 16:33:12 +08:00
liang.chao 87f358430c 装备增加校验日期,校验周期 2024-12-05 16:23:04 +08:00
BianLzhaoMin ff0ac16157 代码优化 2024-12-05 13:07:05 +08:00
BianLzhaoMin 895fb62b6c 代码优化 2024-12-05 12:04:24 +08:00
BianLzhaoMin 2f82fffe13 代码完善 2024-12-05 11:51:00 +08:00
BianLzhaoMin 547b648140 需求管理页面优化 2024-12-04 18:31:12 +08:00
BianLzhaoMin 8715f7e45c 代码完善 2024-12-04 18:10:04 +08:00