gold-java

Commit Graph

Select branches

Hide Pull Requests

dev

huangqizheng/feature-20250707173453-7.7bug修改

huangqizheng/feature-20250708175155-7.8bug修复

huangqizheng/feature-20250709163552-7.8导出传输对象修复

huangqizheng/feature-20250710151401-数据同步完成

huangqizheng/feature-20250714180618-数据同步

huangqizheng/feature-20250715100115-非测试数据筛选

huangqizheng/feature-20250717200321-优化导出

huangqizheng/feature-20250718222252-导出修改完毕

huangqizheng/feature-20250719105717-后端完毕

huangqizheng/feature-20250721170818-后端周末修改

huangqizheng/feature-20250722105318-BUG修改

huangqizheng/feature-20250725144236-精简日志

huangqizheng/feature-20250728134614-三期数据库配置

huangqizheng/feature-20250731164458-地区部分修改以及导出的封装

huangqizheng/feature-20250801114957-导出

huangqizheng/feature-20250801180134-消费导出

huangqizheng/feature-20250803175216-导出完毕

huangqizheng/feature-20250804114811-打包配置

huangqizheng/feature-20250805200446-配置修改及充值导出修改

huangqizheng/feature-20250806120055-修复BUG

huangqizheng/feature-20250808172612-bug修复

huangqizheng/feature-20250809103653-修改配置导出重新上传

huangqizheng/feature-20250809184038-研发部校验

huangqizheng/feature-20251104113536-现金管理二期退款修改

huangqizheng/feature-20251119150446-退款合并后

lihuilin/hotfix-20250810160509-余额地区传参

lihuilin/hotfix-20250815-审核默认更新时间

lihuilin1015备份

lijianlin/feature-20250623120104-工作台与审核

lijianlin/feature-20250710152503-二期工作台与部分权限

lijianlin/feature-20250728171217-三期金豆消费相关

lijianlin/feature-202509231533026-现金管理-收款管理

lijianlin/feature-20251104110749-现金管理二期

master

milestone-20250702-金币重构一期

milestone-20250711-金币重构二期

milestone-20250727-金币重构三期

milestone-20251016-现金管理

milestone-20251104-现金管理二期

sunjiabei/feature-20250623130922-消费功能

sunjiabei/feature-20250710132313-二期模块

sunjiabei/feature-20250725135225-金币三期

sunjiabei/feature-20250822111257-平台和商品id字段替换

sunjiabei/feature-20250924164720-现金管理

sunjiabei/feature-20251021102635-银行接口

wangyetao/feature-20250628170337-汇率

wangyetao/feature-20250715095107-地区数据权限

yufenghao/feature-20251106105659-现金管理接口优化

yufenghao1106

工作流配置

0a00d57b12 地区权限异常处理 lijianlin 2025-07-18 09:37:59 +0800
a7c989f345 Merge remote-tracking branch 'origin/milestone-20250711-金币重构二期' into milestone-20250711-金币重构二期 huangqizhen 2025-07-17 20:07:57 +0800
5ac78b6bb0 7.17导出优化 huangqizheng/feature-20250717200321-优化导出 huangqizhen 2025-07-17 20:07:19 +0800
86113e4d8c Merge remote-tracking branch 'refs/remotes/origin/lijianlin/feature-20250710152503-二期工作台与部分权限' into milestone-20250711-金币重构二期 lijianlin 2025-07-17 18:12:53 +0800
3c122611cb 上下级角色联查 lijianlin 2025-07-17 18:11:33 +0800
279153015d 地区属性校验 sunjiabei 2025-07-17 15:46:05 +0800
cef1e23ef8 Merge remote-tracking branch 'refs/remotes/origin/lijianlin/feature-20250710152503-二期工作台与部分权限' into milestone-20250711-金币重构二期 lijianlin 2025-07-17 14:46:09 +0800
c606f8e879 用户地区权限 lijianlin 2025-07-17 14:27:00 +0800
d646f2c88c 权限管理校验以及删除校验 sunjiabei 2025-07-17 14:23:17 +0800
3723d851a7 角色删除完成 sunjiabei 2025-07-17 13:51:08 +0800
a177b9e471 角色删除完成 sunjiabei 2025-07-17 13:50:26 +0800
009571b7d0 角色查询完成 sunjiabei 2025-07-17 13:27:24 +0800
53bf85aa4a 角色查询部分实现 sunjiabei 2025-07-17 11:52:05 +0800
8be4cb5cc5 Merge branch 'milestone-20250711-金币重构二期' into sunjiabei/feature-20250710132313-二期模块 sunjiabei 2025-07-17 11:11:32 +0800
86fa0fed3a Merge remote-tracking branch 'origin/milestone-20250711-金币重构二期' into milestone-20250711-金币重构二期 lijianlin 2025-07-17 10:44:53 +0800
66b08a8def 退款类型 sunjiabei 2025-07-17 10:43:14 +0800
1fe0eb1584 退款类型 sunjiabei 2025-07-17 10:42:01 +0800
52a53b4f9a 修复个人信息地区不显示 lijianlin 2025-07-17 10:40:46 +0800
fecc0e5c6b Merge branch 'milestone-20250711-金币重构二期' of http://39.101.133.168:8807/huangqizhen/gold-java into lijianlin/feature-20250710152503-二期工作台与部分权限 lijianlin 2025-07-16 14:05:46 +0800
7c664f8a4f 卡片更新时间 lijianlin 2025-07-16 14:05:17 +0800
272d88657b 自定义注解 wangyetao/feature-20250715095107-地区数据权限 wangyetao 2025-07-16 11:43:49 +0800
525e0b7915 自定义注解 wangyetao 2025-07-16 11:40:06 +0800
39658f01f3 获取用户权限地区 wangyetao 2025-07-16 11:32:39 +0800
7c05e5176e 获取用户权限地区 $HY-LSZNWIN10\Administrator$ HY-LSZNWIN10\Administrator 2025-07-16 11:29:25 +0800
7e35f2db1e Merge branch 'refs/heads/lijianlin/feature-20250710152503-二期工作台与部分权限' into milestone-20250711-金币重构二期 lijianlin 2025-07-16 10:54:31 +0800
8a13c37de4 缺失市场补齐 lijianlin 2025-07-16 10:53:55 +0800
07530f1976 编辑管理员地区优化与校验 lijianlin 2025-07-16 09:20:25 +0800
e2f07f31be 新增管理员地区校验 lijianlin 2025-07-15 17:12:35 +0800
ce7ea6d9cf Merge branch 'sunjiabei/feature-20250710132313-二期模块' into milestone-20250711-金币重构二期 sunjiabei 2025-07-15 17:11:07 +0800
b40b2a7141 角色新增剩余接口。菜单校验和角色校验 sunjiabei 2025-07-15 17:10:41 +0800
593a9ee5a6 Merge remote-tracking branch 'refs/remotes/origin/lijianlin/feature-20250710152503-二期工作台与部分权限' into milestone-20250711-金币重构二期 lijianlin 2025-07-15 15:35:15 +0800
313f933ddd 图表优化 lijianlin 2025-07-15 15:22:33 +0800
de263ab364 角色名称校验，权限查询，角色新增部分接口 sunjiabei 2025-07-15 15:20:36 +0800
8239b27272 获取用户权限地区 $HY-LSZNWIN10\Administrator$ HY-LSZNWIN10\Administrator 2025-07-15 10:27:20 +0800
37bb058f54 flag=1 sunjiabei 2025-07-15 10:16:14 +0800
fe97a393aa Merge branch 'milestone-20250711-金币重构二期' into sunjiabei/feature-20250710132313-二期模块 sunjiabei 2025-07-15 10:05:18 +0800
d31de78076 Merge branch 'milestone-20250711-金币重构二期' into sunjiabei/feature-20250710132313-二期模块 sunjiabei 2025-07-15 10:03:52 +0800
507f7090a4 7.15筛选非测试数据 huangqizheng/feature-20250715100115-非测试数据筛选 huangqizhen 2025-07-15 10:02:03 +0800
0f15490913 二期任务合并 sunjiabei 2025-07-15 09:59:53 +0800
c0ec4a480f 定时任务开启 lijianlin 2025-07-15 08:55:56 +0800
dede99f675 Merge remote-tracking branch 'refs/remotes/origin/lijianlin/feature-20250710152503-二期工作台与部分权限' into milestone-20250711-金币重构二期 lijianlin 2025-07-14 18:12:27 +0800
cbf7711f53 计算bug修复 lijianlin 2025-07-14 18:10:49 +0800
9dbb61ad6a 7.14数据同步修改 huangqizheng/feature-20250714180618-数据同步 huangqizhen 2025-07-14 18:08:34 +0800
736ffc4733 7.14数据同步修改 huangqizhen 2025-07-14 18:08:01 +0800
eb46e64401 Merge branch 'milestone-20250702-金币重构一期' of http://39.101.133.168:8807/huangqizhen/gold-java into milestone-20250702-金币重构一期 lihuilin 2025-07-14 16:17:51 +0800
a80e3c61e9 工作台性能优化 lijianlin 2025-07-14 16:14:21 +0800
2c7c94a4f8 重置可为0 sunjiabei 2025-07-14 15:34:31 +0800
5dbc73aaee 重置密码 sunjiabei 2025-07-14 15:23:33 +0800
d9abca0105 注释 sunjiabei 2025-07-14 15:06:48 +0800
3153e8f795 工作台更新优化 lijianlin 2025-07-11 15:07:46 +0800
f98ef0a92a 修改用户 sunjiabei 2025-07-11 15:07:39 +0800
f9082c8f64 修改用户 sunjiabei 2025-07-11 09:23:26 +0800
fe7be57d2e Merge branch 'refs/heads/lijianlin/feature-20250710152503-二期工作台与部分权限' into milestone-20250711-金币重构二期 lijianlin 2025-07-10 17:35:29 +0800
ea99e40db5 密码重置 sunjiabei 2025-07-10 17:23:16 +0800
047d324482 更新管理员优化（还没写完） lijianlin 2025-07-10 17:17:29 +0800
5feaf37856 Merge branch 'milestone-20250702-金币重构一期' into sunjiabei/feature-20250710132313-二期模块 sunjiabei 2025-07-10 16:15:06 +0800
4e5d9ea68a Merge remote-tracking branch 'origin/milestone-20250702-金币重构一期' into milestone-20250702-金币重构一期 lijianlin/feature-20250623120104-工作台与审核 lijianlin 2025-07-10 15:22:35 +0800
879b8da64f 修改管理员（部分） lijianlin 2025-07-10 15:20:38 +0800
aba4077ea9 Merge branch 'refs/heads/huangqizheng/feature-20250710151401-数据同步完成' into milestone-20250702-金币重构一期 milestone-20250702-金币重构一期 huangqizhen 2025-07-10 15:14:55 +0800
c5f2e5261d 7.10数据库同步 huangqizheng/feature-20250710151401-数据同步完成 huangqizhen 2025-07-10 15:14:25 +0800
3e71823a73 密码修改 sunjiabei 2025-07-10 15:10:11 +0800
47d0e611c8 密码修改 sunjiabei 2025-07-10 15:04:08 +0800
9b4f475625 密码模块 sunjiabei/feature-20250623130922-消费功能 sunjiabei 2025-07-10 13:24:41 +0800
e6950a483f 充值次数与首充时间修改 lijianlin 2025-07-10 11:25:17 +0800
5e39bde176 Merge branch 'milestone-20250702-金币重构一期' of http://39.101.133.168:8807/huangqizhen/gold-java into milestone-20250702-金币重构一期 lihuilin 2025-07-10 10:31:22 +0800
8949f2e9a0 7.9数据库同步 huangqizhen 2025-07-09 21:06:47 +0800
130db4a62f 解开传erp限制，所有订单往erp传 lijianlin 2025-07-09 20:29:49 +0800
acc2965582 新增用户与更新用户1 lijianlin 2025-07-09 20:12:58 +0800
a36dc3d488 新增用户与更新用户 lijianlin 2025-07-09 19:54:26 +0800
cf142e26c4 用户全部信息查询 sunjiabei 2025-07-09 19:28:27 +0800
ac71a60248 查id sunjiabei 2025-07-09 18:22:00 +0800
144271c3c8 Merge remote-tracking branch 'origin/milestone-20250702-金币重构一期' into milestone-20250702-金币重构一期 lijianlin 2025-07-09 18:03:51 +0800
af8f888a88 退款驳回bug修复 lijianlin 2025-07-09 18:03:25 +0800
abb6ef1aad 查id sunjiabei 2025-07-09 17:58:33 +0800
5362ee33c8 退款通过bug修复 lijianlin 2025-07-09 17:51:40 +0800
5166afcf0f Merge branch 'milestone-20250702-金币重构一期' of http://39.101.133.168:8807/huangqizhen/gold-java into milestone-20250702-金币重构一期 lihuilin 2025-07-09 17:43:34 +0800
f842a5a1c1 Merge remote-tracking branch 'origin/milestone-20250702-金币重构一期' into milestone-20250702-金币重构一期 lijianlin 2025-07-09 17:42:56 +0800
0972f08e05 审核通过bug修复 lijianlin 2025-07-09 17:42:38 +0800
7a71dfa488 Merge branch 'milestone-20250702-金币重构一期' of http://39.101.133.168:8807/huangqizhen/gold-java into milestone-20250702-金币重构一期 lihuilin 2025-07-09 17:40:14 +0800
a40ea38f07 ADMI, sunjiabei 2025-07-09 17:14:47 +0800
6902e669b8 审核通过bug修复 lijianlin 2025-07-09 17:02:08 +0800
5fc7f2a3a0 Merge remote-tracking branch 'origin/milestone-20250702-金币重构一期' into milestone-20250702-金币重构一期 lijianlin 2025-07-09 16:37:23 +0800
9bf8481d6e Merge branch 'refs/heads/lijianlin/feature-20250623120104-工作台与审核' into milestone-20250702-金币重构一期 lijianlin 2025-07-09 16:37:08 +0800
cc352bd81d Merge remote-tracking branch 'origin/milestone-20250702-金币重构一期' into milestone-20250702-金币重构一期 huangqizhen 2025-07-09 16:36:39 +0800
055816a026 7.9导出筛选对象修复 huangqizheng/feature-20250709163552-7.8导出传输对象修复 huangqizhen 2025-07-09 16:36:11 +0800
8fa1fc3a2e 充值审核明细添加汇率校验 lijianlin 2025-07-09 16:36:06 +0800
735b74c148 删除111111 sunjiabei 2025-07-09 16:06:14 +0800
80039241a7 充值次数bug修复，工作台实时更新接口 lijianlin 2025-07-09 15:00:43 +0800
f0db83bf61 退款校验 sunjiabei 2025-07-09 14:11:18 +0800
e598198d4b 7.8导出筛选修复 huangqizheng/feature-20250708175155-7.8bug修复 huangqizhen 2025-07-08 19:02:31 +0800
b6d976c527 7.8导出修复 huangqizhen 2025-07-08 17:52:33 +0800
14dcd1cd53 Merge branch 'milestone-20250702-金币重构一期' of http://39.101.133.168:8807/huangqizhen/gold-java into milestone-20250702-金币重构一期 lihuilin 2025-07-08 16:44:08 +0800
2956ff8e28 Merge remote-tracking branch 'origin/milestone-20250702-金币重构一期' into milestone-20250702-金币重构一期 lijianlin 2025-07-08 15:22:48 +0800
8c40a9f4ba 汇率校验 lijianlin 2025-07-08 15:19:14 +0800
0a068e447a 汇率校验 sunjiabei 2025-07-08 15:12:07 +0800
2ba06397d2 订单号 sunjiabei 2025-07-08 14:57:44 +0800
914eab6f70 消费扣减用户金币优化 lijianlin 2025-07-08 13:06:50 +0800
4ea799106b Merge branch 'refs/heads/lijianlin/feature-20250623120104-工作台与审核' into milestone-20250702-金币重构一期 lijianlin 2025-07-08 11:47:19 +0800
27b0ee53a7 充值审核修复驳回仍加金币bug，金币明细筛选修复，充值明细未筛选驳回与未审核数据 lijianlin 2025-07-08 11:46:02 +0800
0df1b1dce8 精网号校验 sunjiabei 2025-07-08 10:59:06 +0800