Commit Graph

Select branches

Hide Pull Requests

4/1日二期

Hongxilin

activity_recharge_detail_audit_workspace_hxl

dev

donghaolin

donghaolin-2

feat/lhl

feat/zry

lhl

main

master

rate_recharge_consume_refund_donghaolin

test

zln

zln1

zry

#1

#2

Mono Color

• 2537b1350d 0517要回学校了 main lihuilin 2025-05-17 11:59:20 +0800
• 24ee19f99c 排序完好，审核时间有 lihuilin 2025-05-16 17:11:01 +0800
• 64eb605207 排查排序+审核的审核时间 lihuilin 2025-05-16 16:04:04 +0800
• 344fdf8989 0516先上一版 lihuilin 2025-05-16 11:06:01 +0800
• 4f647e2f03 push0514 zry 2025-05-14 16:24:47 +0800
• ebb16823b0 0514pm upload zry 2025-05-14 15:00:41 +0800
• 33da845347 0513merge success zry 2025-05-14 10:48:01 +0800
• a5a73dec10 0513merge zry 2025-05-14 10:43:13 +0800
• 5aefc97970 0514早，修几个bug lihuilin 2025-05-14 10:34:40 +0800
• 1fcafa069e 0512merge zry 2025-05-12 17:54:59 +0800
• fc1c45246a 导出excel功能完成 zry 2025-05-12 17:51:04 +0800
• 3356c46603 时间改完 lihuilin 2025-05-12 17:46:26 +0800
• 0e6871321e 改完工作台，可以提测 lihuilin 2025-05-12 16:20:37 +0800
• d728848600 0512bug改完 lihuilin 2025-05-12 16:04:43 +0800
• 95550e517d Merge branch 'main' of http://39.101.133.168:8807/yanjiaqing/gold_vue zry 2025-05-12 11:14:11 +0800
• 9cd7f8ae53 Merge branch 'feat/lhl' zry 2025-05-12 11:12:12 +0800
• 2072b1f945 自定义表头默认展示全部 lihuilin 2025-05-12 11:11:04 +0800
• 29e704f4c0 新增消费客服删除间距修改 lihuilin 2025-05-12 10:46:05 +0800
• ed32676520 0512准备提测的main lihuilin 2025-05-12 10:42:45 +0800
• 237cc42cd6 0512准备提测 feat/lhl lihuilin 2025-05-12 10:39:10 +0800
• 875359c192 0512 merge success gogo test zry 2025-05-12 10:26:57 +0800
• 8237843c15 0512前端提测合并 zry 2025-05-12 10:07:39 +0800
• 1d8d36bdf4 0512前端提测 zry 2025-05-12 09:59:44 +0800
• 4d333b45d8 自定义表头bug修完 lihuilin 2025-05-11 20:13:28 +0800
• f5be3cb4ab Merge branch 'zln1' into dev合并zln1分支到dev分支 dev donghaolin 2025-05-11 10:54:54 +0800
• 859e2a773a zry修改 zry 2025-04-25 13:45:55 +0800
• ca4ab12418 功能联调bug修改 zhaoln 2025-04-22 13:30:07 +0800
• 53cc2a3e90 新增线上充值页面以及bug修改 zhaoln 2025-04-21 17:05:42 +0800
• 4eee080644 功能联调bug修改 zhaoln 2025-04-19 17:51:25 +0800
• 4faca008a3 联调加改bug zhaoln 2025-04-17 17:56:44 +0800
• c3125ea7a9 bug 修改和新功能补充 zhaoln 2025-04-16 17:41:53 +0800
• 042ddebe9a 修改所有表格分页数据 zhaoln 2025-04-15 18:23:39 +0800
• fdc5824335 客户信息新增字段所属门店 zhaoln 2025-04-15 10:32:11 +0800
• a0d59e26ac 金豆消费明细页面开发 zhaoln 2025-04-14 18:00:42 +0800
• e10c0efb81 bug修改 zhaoln 2025-04-14 16:38:52 +0800
• 9fb24b9b94 金豆充值和余额页面开发联调 zhaoln 2025-04-12 17:54:04 +0800
• b19610de40 金豆增加充值页面的开发 zhaoln 2025-04-11 18:03:41 +0800
• 53f592fa9d 金豆增加充值页面的开发 zhaoln 2025-04-11 18:02:14 +0800
• f6364cd4dd 封装工作台代码 zhaoln 2025-04-10 18:36:56 +0800
• 1bf7548122 4/9号，地区通过url传递 donghaolin 2025-04-10 11:06:36 +0800
• e69980e5f3 修改明细字段 zhaoln 2025-04-10 11:14:05 +0800
• badcc44d9e 前四个模块请求封装修改 donghaolin 2025-04-08 17:26:12 +0800
• 0f2ea7893c 请求修改 zhaoln 2025-04-08 15:58:24 +0800
• 132fe6958a 0430废废了Merge branch 'feat/lhl' lihuilin 2025-04-30 16:57:58 +0800
• 3c54462f78 0430麻了 lihuilin 2025-04-30 16:52:36 +0800
• 9aeb8a3f0d Merge branch 'main' of http://39.101.133.168:8807/yanjiaqing/gold_vue lihuilin 2025-04-30 16:45:44 +0800
• 703486fc8c this merge feat/zry branch zry 2025-04-30 16:22:08 +0800
• 23e2486ea8 完成充值消费明细的excel的导出功能 feat/zry zry 2025-04-30 16:16:02 +0800
• 35a5413266 消费导出完成，bug改完 lihuilin 2025-04-30 16:07:54 +0800
• c658588182 0430改完bug lihuilin 2025-04-30 14:01:11 +0800
• 81e2cf8fe5 Merge branch 'feat/zry' of http://39.101.133.168:8807/yanjiaqing/gold_vue into feat/zry zry 2025-04-30 10:51:38 +0800
• 514c68c65e Merge branch 'main' of http://39.101.133.168:8807/yanjiaqing/gold_vue lihuilin 2025-04-30 10:45:36 +0800
• 423b8964b2 没整合，自己的 lhl lihuilin 2025-04-30 10:34:50 +0800
• ef1fe91676 Merge branch 'feat/zry' of http://39.101.133.168:8807/yanjiaqing/gold_vue into feat/zry lihuilin 2025-04-30 10:33:30 +0800
• 7a608d9168 0430整合完 lihuilin 2025-04-30 10:31:40 +0800
• ff8e4bcd7c Merge branch 'main' into feat/zry zry 2025-04-30 10:30:31 +0800
• 20623ef0ba 导出功能的完成自测bug修复完成 zry 2025-04-30 10:23:35 +0800
• 26a0214276 合并完成导出excel找回 zry 2025-04-29 18:03:19 +0800
• 12411d5c77 跳不了 lihuilin 2025-04-29 18:55:49 +0800
• 59fbb3f106 Merge branch 'feat/lhl' of http://39.101.133.168:8807/yanjiaqing/gold_vue into feat/lhl zry 2025-04-29 18:11:09 +0800
• d6a4c7ae92 充值类型下拉框失败 lihuilin 2025-04-29 18:06:45 +0800
• afd1a05c3b 导出excel功能完成 zry 2025-04-29 18:03:19 +0800
• 4ee96e5ee2 合并main到feat/lhl zry 2025-04-29 16:12:06 +0800
• d1aaf0d4e8 测试合并branch 'feat/zry' zry 2025-04-29 16:00:28 +0800
• c1ff9eaca0 测试新的合并方案 zry 2025-04-29 15:54:56 +0800
• 08c57ccb87 重做了客户金币明细的导出excel zry 2025-04-29 15:40:31 +0800
• 229c13b945 改完今昨近七天 lihuilin 2025-04-29 13:44:03 +0800
• aca98aa791 新增活动的警告修改 zry 2025-04-28 14:24:30 +0800
• 26012f376d 延迟的更改与提交（合并） zry 2025-04-28 14:20:49 +0800
• 204ec99a95 合并 zry 2025-04-28 14:18:01 +0800
• 5649b90cf7 已完成的合并 zry 2025-04-28 14:13:36 +0800
• eaf90724fd 活动页数100删除，工作台 zry zry 2025-04-28 14:03:58 +0800
• a117177bbb 0428提测未整合 lihuilin 2025-04-28 13:59:40 +0800
• 653532717b 三期bug结束 lihuilin 2025-04-28 11:17:43 +0800
• 6736959de2 按钮失效bug修复；商品对应接口改正... zry 2025-04-26 18:38:01 +0800
• 83a81b0eca .env.production的更改 zry 2025-04-26 15:13:24 +0800
• 21fde0c627 1.上正式地址，2.修复金豆明细地区无法更新金豆总额的bug zry 2025-04-26 15:08:33 +0800
• 74b52628e0 1.修复了在金豆明细地区搜索条件时的金豆总额更新，2.合并了lhl分支3.上正式环境 zry 2025-04-26 14:58:05 +0800
• fccafa7087 Merge branch 'lhl' of http://39.101.133.168:8807/yanjiaqing/gold_vue into lhl zry 2025-04-26 14:42:11 +0800
• 55cc8c7b81 创建了zry新分支并push代码 zry 2025-04-26 10:30:04 +0800
• 3ffaf69421 测试正式地址正常 lihuilin 2025-04-26 10:16:05 +0800
• f454649913 整合完毕 lihuilin 2025-04-25 14:54:00 +0800
• d9a91abab1 充值审核去空格尝试 lihuilin 2025-04-25 14:51:49 +0800
• a9b1a980f4 zry修改 zln1 zry 2025-04-25 13:45:55 +0800
• 1e3f50e5b8 功能联调bug修改 test zhaoln 2025-04-22 13:30:07 +0800
• 4b81ccbaef 新增线上充值页面以及bug修改 zhaoln 2025-04-21 17:05:42 +0800
• 3382e18d53 功能联调bug修改 zhaoln 2025-04-19 17:51:25 +0800
• b4ee945493 联调加改bug zhaoln 2025-04-17 17:56:44 +0800
• 71a7a115a6 bug 修改和新功能补充 zhaoln 2025-04-16 17:41:53 +0800
• b921ec3fff 修改所有表格分页数据 zhaoln 2025-04-15 18:23:39 +0800
• 39faec7c2b Merge branch 'test' of http://39.101.133.168:8807/yanjiaqing/gold_vue into zln1 zhaoln 2025-04-15 10:55:30 +0800
• 1d39614586 客户信息新增字段所属门店 zhaoln 2025-04-15 10:32:11 +0800
• a393f511d4 金豆消费明细页面开发 zhaoln 2025-04-14 18:00:42 +0800
• ab3c793266 bug修改 zhaoln 2025-04-14 16:38:52 +0800
• ba19fbf42e 金豆充值和余额页面开发联调 zhaoln 2025-04-12 17:54:04 +0800
• 2939348502 金豆增加充值页面的开发 zhaoln 2025-04-11 18:03:41 +0800
• b28983900e 金豆增加充值页面的开发 zhaoln 2025-04-11 18:02:14 +0800
• 43b0f76e21 封装工作台代码 zhaoln 2025-04-10 18:36:56 +0800
• afc6726c41 Merge branch 'zln1' of http://39.101.133.168:8807/yanjiaqing/gold_vue into zln1 zhaoln 2025-04-10 11:14:15 +0800
• 1be305a252 修改明细字段 zhaoln 2025-04-10 11:14:05 +0800