 DuGuYang
|
33a36ca7d3
Merge branch 'feature-dgy-运营中心额度变动明细备注显示' into feature-dgy-后台测试
|
2 lat temu |
|
DuGuYang
|
19bb4f81ac
Merge branch 'feature-dgy-机具回仓重置服务费和费率' into DuGuYang
|
2 lat temu |
|
DuGuYang
|
3c6b9d7295
机具解绑重置服务费和费率
|
2 lat temu |
 lcl
|
5ff2cd017f
Merge branch 'DuGuYang' into develop
|
2 lat temu |
 lcl
|
d2fc5ca532
设置费率后要保存商户信息
|
2 lat temu |
|
DuGuYang
|
a94a8c5646
Merge branch 'feature-dgy-后台测试' into test-adminserver
|
2 lat temu |
|
DuGuYang
|
118121a40b
Merge branch 'feature-dgy-机具回仓重置服务费和费率' into DuGuYang
|
2 lat temu |
|
DuGuYang
|
693dc35705
Merge branch 'feature-dgy-机具回仓重置服务费和费率' into feature-dgy-后台测试
|
2 lat temu |
|
DuGuYang
|
4e9092fc3d
修改备注描述
|
2 lat temu |
|
DuGuYang
|
5bcc301642
Merge branch 'feature-dgy-机具回仓重置服务费和费率' into DuGuYang
|
2 lat temu |
|
lcl
|
cca9f743ee
构造盒子交易数据，tradetype赋值为0
|
2 lat temu |
|
lcl
|
d7996a252e
来客吧电签sp数据入库问题
|
2 lat temu |
|
DuGuYang
|
4e4994f6c4
暂存
|
2 lat temu |
|
DuGuYang
|
a765c7ae9f
Merge branch 'feature-dgy-后台测试' into test-adminserver
|
2 lat temu |
|
DuGuYang
|
b5ebf2dba2
Merge branch 'feature-dgy-设置机具服务费优化' into feature-dgy-后台测试
|
2 lat temu |
|
DuGuYang
|
f03831ce23
完成，待测试
|
2 lat temu |
|
DuGuYang
|
9e2aa8dccf
Merge branch 'feature-dgy-收支明细区分未使用额度和可提现额度' into DuGuYang
|
2 lat temu |
|
DuGuYang
|
17704ee088
Merge branch 'feature-dgy-后台测试' into test-adminserver
|
2 lat temu |
|
DuGuYang
|
e972c81174
Merge branch 'feature-dgy-取消首台限制' into feature-dgy-后台测试
|
2 lat temu |
|
DuGuYang
|
94cd37d993
暂存
|
2 lat temu |
|
DuGuYang
|
5d4b525712
Merge branch 'feature-dgy-后台测试' into test-adminserver
|
2 lat temu |
|
DuGuYang
|
3f4c9cdb0e
Merge branch 'feature-dgy-机具回仓重置服务费和费率' into feature-dgy-后台测试
|
2 lat temu |
|
DuGuYang
|
f97b816f8c
完成，待测试
|
2 lat temu |
|
DuGuYang
|
052fd978e7
完成
|
2 lat temu |
|
lcl
|
3578edd567
Merge branch 'fix-添加测试SP数据' into test-adminserver
|
2 lat temu |
|
lcl
|
cea24d5d87
添加测试SP数据
|
2 lat temu |
|
DuGuYang
|
079f70d7ec
Merge branch 'feature-dgy-后台测试' into test-adminserver
|
2 lat temu |
|
DuGuYang
|
8cc261c56f
删除补录奖励冗余代码，老的20开机奖
|
2 lat temu |
|
DuGuYang
|
a8aab918df
调整，添加对应奖励发放条件
|
2 lat temu |
|
DuGuYang
|
79c2373e42
添加50开机奖队列
|
2 lat temu |
