lihuilin
|
65869031dc
|
虽然不知道哪来的后端分支，但还是提交一下
|
10 months ago |
|
lihuilin
|
9790875843
|
merge hqz branch 'origin' into lhl
|
10 months ago |
|
lihuilin
|
004ed60472
|
拉取黄其振代码无报错
|
10 months ago |
|
lihuilin
|
47b07b88bb
|
测试
|
10 months ago |
huangqizhen
|
cb45a66c99
|
0513lhl改登录报错信息和图片路径
|
10 months ago |
|
huangqizhen
|
8a2aea0989
|
4.29 时间排序
|
10 months ago |
|
huangqizhen
|
919f81cabb
|
Merge branch 'refs/heads/ljl' into hqz
|
10 months ago |
|
huangqizhen
|
35f6b254ec
|
4.26 修复工作台
|
10 months ago |
jianlin
|
f3a9264e74
|
4.27bug修改 明细金币统计，消费明细商品名查询
|
10 months ago |
|
huangqizhen
|
6226e2cfd3
|
Merge branch 'refs/heads/Huang' into hqz
|
10 months ago |
|
huangqizhen
|
8f62f0305c
|
4.26 修复金豆充值明细地区查询页面
|
10 months ago |
|
jianlin
|
1f32297c7a
|
4.26修复bug：商品名称对应错误
|
10 months ago |
|
jianlin
|
249c9d8805
|
4.26修改活动页面查询
|
10 months ago |
|
huangqizhen
|
9307b8672a
|
4.26 新增用户默认加入123密码
|
10 months ago |
|
huangqizhen
|
31b27a2fa5
|
Merge remote-tracking branch 'origin/hqz' into hqz
|
10 months ago |
|
huangqizhen
|
e2dd14cfdd
|
Merge branch 'refs/heads/Huang' into dev
# Conflicts:
# src/main/java/com/example/demo/controller/ConsumeController.java
# src/main/java/com/example/demo/controller/RechargeController.java
# src/main/resources/application.yml
|
10 months ago |
|
huangqizhen
|
e0d2073597
|
4.25 修复bug
|
10 months ago |
|
jianlin
|
3ce0e27871
|
金币bug修改
|
10 months ago |
|
jianlin
|
be7d1d3392
|
Merge branch 'hqz' of http://39.101.133.168:8807/yanjiaqing/gold_java into ljl
|
10 months ago |
|
huangqizhen
|
fe6c0fa6a7
|
4.21 修改线上充值明细充值类型的映射
|
10 months ago |
|
jianlin
|
ffcefb3547
|
删除测试readme
|
10 months ago |
|
jianlin
|
f306abce4d
|
Merge branch 'hqz' of http://39.101.133.168:8807/yanjiaqing/gold_java into ljl
# Conflicts:
# src/main/java/com/example/demo/controller/ConsumeController.java
# src/main/java/com/example/demo/controller/RechargeController.java
# src/main/resources/application.yml
|
10 months ago |
|
jianlin
|
ca7c0f01e5
|
删除测试文件readme
|
10 months ago |
|
jianlin
|
49925178c2
|
恢复测试文件readme
|
10 months ago |
|
jianlin
|
00f5f921ca
|
删除测试文件readme
|
10 months ago |
|
jianlin
|
f06b8f2ca2
|
新增测试2
|
10 months ago |
|
huangqizhen
|
8770a43f2f
|
4.21 充值添加映射price
|
10 months ago |
|
jianlin
|
75c958d7f9
|
新增测试1
|
10 months ago |
|
huangqizhen
|
d8c12cfd90
|
4.20 pay实体类添加ipaddress
|
10 months ago |
|
huangqizhen
|
3474cd007e
|
4.20 修改余额接口
|
10 months ago |
|
huangqizhen
|
904f96170b
|
4.18 完成需求接口
|
10 months ago |
|
huangqizhen
|
f9f7157676
|
4.18 修改bug
|
10 months ago |
|
huangqizhen
|
42563d2f42
|
4.17 完成消费明细接口
|
10 months ago |
|
huangqizhen
|
d89e348e68
|
4.17 充值的时间条件查询修改
|
10 months ago |
|
huangqizhen
|
274f6ecf99
|
4.16 完成金豆的三个页面的编写
|
10 months ago |
|
huangqizhen
|
4c4d96d099
|
4.12 修复bug
|
11 months ago |
|
huangqizhen
|
0e5e9af0d0
|
4.12 完成金豆明细的三个接口
|
11 months ago |
|
huangqizhen
|
864e706eb5
|
4.11修复接口无法链接问题
|
11 months ago |
|
huangqizhen
|
3feab174a2
|
4.11查询客户信息与新增金豆记录
|
11 months ago |
|
huangqizhen
|
33abf2a435
|
4.11多数据库的链接及工作台柱状图的地区筛选
|
11 months ago |
|
huangqizhen
|
285115e16a
|
4.10多数据库的链接及工作台柱状图的地区筛选
|
11 months ago |
|
huangqizhen
|
6358ded97b
|
4.10充值明细统计的修复以及多数据库的链接
|
11 months ago |
|
huangqizhen
|
9b8f17a36c
|
4.9工作台新增根据地区查询卡片内容
|
11 months ago |
|
huangqizhen
|
8ee59b5793
|
4.8修改充值明细 金币明细导出修改
|
11 months ago |
|
huangqizhen
|
e82e2a677a
|
4.7 金币明细导出修改
|
11 months ago |
|
huangqizhen
|
807307eeff
|
4.7 金币明细更新数量修改
|
11 months ago |
|
huangqizhen
|
3e9332a13b
|
4.6 金币余额修改
|
11 months ago |
 huangqizhen
|
cb4e08907a
|
4.6 第三卡片修复2.0
|
11 months ago |
|
huangqizhen
|
b54c6dee25
|
4.6 第三卡片修复
|
11 months ago |
|
huangqizhen
|
c36a534e47
|
4.2 金币明细修复
|
11 months ago |
