Commit Graph

Select branches

Hide Pull Requests

Huang

consume_lly

detached

detached2

dev

hqz

lhl

ljl

lly

master

recharge_audit_huangqizhen

recharge_rate-and-refund-zlp

sjb

#1

Mono Color

• 691f90ed33 Merge remote-tracking branch 'origin/sjb' into sjb sjb ljl Your Name 2025-06-11 10:35:42 +0800
• 2f4842950a 6月11日汇总 Your Name 2025-06-11 10:35:10 +0800
• 1325072223 Merge remote-tracking branch 'origin/sjb' into sjb jianlin 2025-06-11 10:28:47 +0800
• 31569058d6 6月11日汇总 Your Name 2025-06-11 10:24:02 +0800
• b826f289d9 金币bug修改5.19退款商品homilyChart金币数统计 jianlin 2025-05-19 16:44:16 +0800
• 0e1cbaaf8b Merge branch 'sjb' of http://39.101.133.168:8807/yanjiaqing/gold_java into ljl jianlin 2025-05-18 15:52:55 +0800
• a0f8b0d330 金币bug修改5.18退款商品 jianlin 2025-05-18 15:52:09 +0800
• 7624973628 金币bug修改5.18退款商品 jianlin 2025-05-18 15:50:54 +0800
• 96b62db920 5月17日bug修改 Your Name 2025-05-17 10:10:30 +0800
• d491f597d4 5月16日字段修改 Your Name 2025-05-16 16:57:39 +0800
• 19f0897a23 5月16日字段修改 Your Name 2025-05-16 16:33:58 +0800
• 887a6ead2d 5月16日字段修改 Your Name 2025-05-16 15:11:37 +0800
• bee922a633 5月16日字段修改 Your Name 2025-05-16 14:40:50 +0800
• afa3ddf2ff 5月16日字段修改 Your Name 2025-05-16 14:29:18 +0800
• d38b0517a1 5月16日字段修改 Your Name 2025-05-16 13:38:35 +0800
• 218677d5b7 5月16日字段修改 Your Name 2025-05-16 13:27:44 +0800
• fb41a0f878 5月16日宝塔路径修改 Your Name 2025-05-16 10:39:56 +0800
• 185038f925 5月14日排序修改，消费网号校验 Your Name 2025-05-14 17:49:25 +0800
• 9eea1134f1 5月14日排序修改，消费网号校验 Your Name 2025-05-14 16:16:03 +0800
• e798942b94 测试 Your Name 2025-05-14 08:20:52 +0800
• 65869031dc 虽然不知道哪来的后端分支，但还是提交一下 lhl lihuilin 2025-05-13 11:23:48 +0800
• 9790875843 merge hqz branch 'origin' into lhl lihuilin 2025-05-13 11:19:46 +0800
• 004ed60472 拉取黄其振代码无报错 lihuilin 2025-05-13 11:09:59 +0800
• 47b07b88bb 测试 lihuilin 2025-05-13 11:09:24 +0800
• cb45a66c99 0513lhl改登录报错信息和图片路径 hqz huangqizhen 2025-05-13 10:24:10 +0800
• 8a2aea0989 4.29 时间排序 huangqizhen 2025-04-29 18:39:28 +0800
• 919f81cabb Merge branch 'refs/heads/ljl' into hqz huangqizhen 2025-04-27 17:25:07 +0800
• 35f6b254ec 4.26 修复工作台 huangqizhen 2025-04-27 15:53:07 +0800
• f3a9264e74 4.27bug修改 明细金币统计，消费明细商品名查询 jianlin 2025-04-27 09:55:41 +0800
• 6226e2cfd3 Merge branch 'refs/heads/Huang' into hqz huangqizhen 2025-04-27 09:36:40 +0800
• 8f62f0305c 4.26 修复金豆充值明细地区查询页面 Huang huangqizhen 2025-04-27 09:32:59 +0800
• 1f32297c7a 4.26修复bug：商品名称对应错误 jianlin 2025-04-26 17:04:16 +0800
• 249c9d8805 4.26修改活动页面查询 jianlin 2025-04-26 11:53:31 +0800
• 9307b8672a 4.26 新增用户默认加入123密码 huangqizhen 2025-04-26 10:52:24 +0800
• 31b27a2fa5 Merge remote-tracking branch 'origin/hqz' into hqz huangqizhen 2025-04-26 10:39:31 +0800
• e2dd14cfdd Merge branch 'refs/heads/Huang' into dev dev huangqizhen 2025-04-26 10:29:29 +0800
• e0d2073597 4.25 修复bug huangqizhen 2025-04-25 10:44:09 +0800
• 3ce0e27871 金币bug修改 jianlin 2025-04-24 08:53:14 +0800
• be7d1d3392 Merge branch 'hqz' of http://39.101.133.168:8807/yanjiaqing/gold_java into ljl jianlin 2025-04-22 10:40:35 +0800
• fe6c0fa6a7 4.21 修改线上充值明细充值类型的映射 huangqizhen 2025-04-21 15:05:14 +0800
• ffcefb3547 删除测试readme jianlin 2025-04-21 13:40:23 +0800
• f306abce4d Merge branch 'hqz' of http://39.101.133.168:8807/yanjiaqing/gold_java into ljl jianlin 2025-04-21 13:37:55 +0800
• ca7c0f01e5 删除测试文件readme jianlin 2025-04-21 11:43:07 +0800
• 49925178c2 恢复测试文件readme jianlin 2025-04-21 11:42:38 +0800
• 00f5f921ca 删除测试文件readme jianlin 2025-04-21 11:41:58 +0800
• f06b8f2ca2 新增测试2 jianlin 2025-04-21 11:39:36 +0800
• 8770a43f2f 4.21 充值添加映射price huangqizhen 2025-04-21 11:23:18 +0800
• 75c958d7f9 新增测试1 jianlin 2025-04-21 11:09:54 +0800
• d8c12cfd90 4.20 pay实体类添加ipaddress huangqizhen 2025-04-21 10:27:35 +0800
• 3474cd007e 4.20 修改余额接口 huangqizhen 2025-04-21 10:22:43 +0800
• 904f96170b 4.18 完成需求接口 huangqizhen 2025-04-20 11:45:09 +0800
• f9f7157676 4.18 修改bug huangqizhen 2025-04-19 15:53:33 +0800
• 42563d2f42 4.17 完成消费明细接口 huangqizhen 2025-04-17 19:18:01 +0800
• d89e348e68 4.17 充值的时间条件查询修改 huangqizhen 2025-04-17 14:11:09 +0800
• 274f6ecf99 4.16 完成金豆的三个页面的编写 huangqizhen 2025-04-17 10:05:17 +0800
• 4c4d96d099 4.12 修复bug huangqizhen 2025-04-12 17:33:24 +0800
• 0e5e9af0d0 4.12 完成金豆明细的三个接口 huangqizhen 2025-04-12 15:04:31 +0800
• 864e706eb5 4.11修复接口无法链接问题 huangqizhen 2025-04-11 19:21:13 +0800
• 3feab174a2 4.11查询客户信息与新增金豆记录 huangqizhen 2025-04-11 19:05:30 +0800
• 33abf2a435 4.11多数据库的链接及工作台柱状图的地区筛选 huangqizhen 2025-04-11 10:30:57 +0800
• 285115e16a 4.10多数据库的链接及工作台柱状图的地区筛选 huangqizhen 2025-04-11 10:29:21 +0800
• 6358ded97b 4.10充值明细统计的修复以及多数据库的链接 huangqizhen 2025-04-10 11:17:26 +0800
• 9b8f17a36c 4.9工作台新增根据地区查询卡片内容 huangqizhen 2025-04-09 14:20:58 +0800
• 8ee59b5793 4.8修改充值明细 金币明细导出修改 huangqizhen 2025-04-09 13:38:15 +0800
• e82e2a677a 4.7 金币明细导出修改 huangqizhen 2025-04-07 11:30:02 +0800
• 807307eeff 4.7 金币明细更新数量修改 huangqizhen 2025-04-07 09:40:30 +0800
• 3e9332a13b 4.6 金币余额修改 huangqizhen 2025-04-06 18:06:28 +0800
• cb4e08907a 4.6 第三卡片修复2.0 huangqizhen 2025-04-06 10:07:23 +0800
• b54c6dee25 4.6 第三卡片修复 huangqizhen 2025-04-06 09:51:03 +0800
• c36a534e47 4.2 金币明细修复 huangqizhen 2025-04-02 21:14:59 +0800
• 7037ccfd1f 4.2 退款审核修复 huangqizhen 2025-04-02 20:51:58 +0800
• 431c92560a 3.31 饼状图重构更新 huangqizhen 2025-03-31 17:39:43 +0800
• 5500ede366 3.31 充值合计添加，以及工作台三个框 huangqizhen 2025-03-31 13:36:03 +0800
• d8c9c89079 3.28 一期最终版本 huangqizhen 2025-03-28 14:04:13 +0800
• ac0311b338 3.27 增加楼上传入的table数据 huangqizhen 2025-03-27 11:07:12 +0800
• 139763af26 3.26 修改部分传入人为用户名的bug huangqizhen 2025-03-26 17:43:28 +0800
• a313bc95fb 3.26 修复测试bug huangqizhen 2025-03-26 10:26:01 +0800
• 324a9760de 3.25 消费修复免费金币减少的bug huangqizhen 2025-03-25 14:50:09 +0800
• 9cda5674ad 3.25消费逻辑处理完毕 huangqizhen 2025-03-25 13:32:34 +0800
• 782891520e 3.24新增判断余额表是否存在此用户并初始化 huangqizhen 2025-03-24 16:48:05 +0800
• 27222d4cb0 3.24新增与楼上对接的相应接口 huangqizhen 2025-03-24 11:33:18 +0800
• e9794e1e35 3.22新增同步数据库 huangqizhen 2025-03-22 11:52:43 +0800
• 3eb56c3c2c 3.18优化查询筛选多地区条件 huangqizhen 2025-03-19 10:05:59 +0800
• 7578d3731c 3.18查询筛选多地区条件 huangqizhen 2025-03-18 16:38:09 +0800
• f3cba3df0f 3.18优化记录ERP传入的type huangqizhen 2025-03-18 11:05:43 +0800
• 8ae3a84812 3.18增加消费的地区查询并增加记录ERP传入的type huangqizhen 2025-03-18 10:46:30 +0800
• f1ceb2f472 3.17添加detail_y表的地区动态查询 huangqizhen 2025-03-17 11:48:01 +0800
• 092790fd27 3.16修复若干bug huangqizhen 2025-03-17 11:25:51 +0800
• c80ff899b4 3.13完善退款审核的合计数 huangqizhen 2025-03-13 13:24:27 +0800
• a7025f15f3 3.13完善退款审核的合计数 huangqizhen 2025-03-13 10:46:13 +0800
• 7a6724e988 3.12完善充值审核的合计数 huangqizhen 2025-03-12 16:04:00 +0800
• 05fd8cc587 3.12新增充值审核的合计数 huangqizhen 2025-03-12 13:56:02 +0800
• 0f5afcb267 3.12客户金币明细新增金币增添筛选 huangqizhen 2025-03-11 15:05:34 +0800
• 80d78923d0 3.11修复recharge表格新增的bug huangqizhen 2025-03-11 11:50:21 +0800
• bf23f6e85c 3.10权限新增添分部经理 huangqizhen 2025-03-10 11:49:40 +0800
• 5fde93b7da 3.10token过期时间修改设置为一天 huangqizhen 2025-03-10 11:21:50 +0800
• bc5e5d150b 3.9修改地区为空会给默认信息且日志报错2.0 huangqizhen 2025-03-09 15:57:42 +0800
• 6b5e78218e 3.9修改地区为空会给默认信息且日志报错 huangqizhen 2025-03-09 15:23:34 +0800
• 3f994293b5 3.9修改时间格式8小时问题 huangqizhen 2025-03-09 15:15:25 +0800
• 72a1588986 修改楼上接口更新userGold表 huangqizhen 2025-02-17 23:14:48 +0800