yulingwei
|
19c3aeec50
|
Merge branch 'feature/promote_base_info' of 47.111.118.107:wmtx/platform into feature/promote_base_info
|
4 years ago |
yulingwei
|
a88b182641
|
upt
|
4 years ago |
陈志
|
f99614e130
|
Merge branch 'fix/change_statement_time' of wmtx/platform into release
|
4 years ago |
chenzhi
|
493197fed2
|
优化重新结算
|
4 years ago |
陈志
|
21052650eb
|
Merge branch 'fix/change_statement_time' of wmtx/platform into release
|
4 years ago |
chenzhi
|
91510679b0
|
Merge branch 'fix/change_compnay_info0729' of 47.111.118.107:wmtx/platform into fix/change_statement_time
|
4 years ago |
chenzhi
|
aabc0703df
|
优化结算时间选择
|
4 years ago |
chenzhi
|
8b8b0721b3
|
优化结算时间
|
4 years ago |
chenzhi
|
853c938edb
|
优化下游个人结算时间
|
4 years ago |
chenzhi
|
92ccc96dcd
|
优化下游公司结算时间审核
|
4 years ago |
chenzhi
|
a14f0abb88
|
上游新增结算时间判断
|
4 years ago |
廖金灵
|
57ea4efb72
|
Merge branch 'hotfix/market_percentage' of wmtx/platform into release
充值订单bug修改
|
4 years ago |
zhengyongxing
|
8c237e19fe
|
充值订单bug修改
|
4 years ago |
廖金灵
|
79f038d62a
|
Merge branch 'hotfix/market_percentage' of wmtx/platform into release
付商户bug修改
|
4 years ago |
zhengyongxing
|
24bcd381a0
|
支付商户bug修改
|
4 years ago |
廖金灵
|
782f2ae51b
|
Merge branch 'hotfix/market_percentage' of wmtx/platform into release
支付商户bug修改
|
4 years ago |
廖金灵
|
3c4cf05a72
|
Merge branch 'feature/reward' of wmtx/platform into release
列表样式
|
4 years ago |
zhengyongxing
|
eb66cfd5d4
|
支付商户bug修改
|
4 years ago |
yulingwei
|
d46fa808c0
|
upt
|
4 years ago |
陈志
|
67dc1b58e6
|
Merge branch 'fix/change_statement_time' of wmtx/platform into release
|
4 years ago |
chenzhi
|
0f284cf9b3
|
优化游戏绑定,已经绑定不出现
|
4 years ago |
廖金灵
|
4b6218f1aa
|
Merge branch 'feature/reward' of wmtx/platform into release
修改选择样式
|
4 years ago |
廖金灵
|
bd00e90c26
|
Merge branch 'feature/payment_merchant' of wmtx/platform into release
修改文字bug
|
4 years ago |
ELF
|
bc193e648e
|
修改
|
4 years ago |
yulingwei
|
f598b19957
|
Merge branch 'feature/reward' of 47.111.118.107:wmtx/platform into feature/reward
|
4 years ago |
yulingwei
|
b995ba34d9
|
upt
|
4 years ago |
zhengyongxing
|
19f59d6482
|
菜单栏修改
|
4 years ago |
廖金灵
|
4911aa1629
|
Merge branch 'hotfix/market_percentage' of wmtx/platform into release
商户bug修改
|
4 years ago |
zhengyongxing
|
eebb38dc8c
|
商户列表字段名称修改
|
4 years ago |
zhengyongxing
|
9d28947f9b
|
商户bug修改
|
4 years ago |
zhengyongxing
|
a960e0a7e4
|
商户bug修改
|
4 years ago |
廖金灵
|
6fff9b2fd3
|
Merge branch 'hotfix/market_percentage' of wmtx/platform into release
商户bug修改
|
4 years ago |
zhengyongxing
|
624a2b7cde
|
商户bug修改
|
4 years ago |
zhengyongxing
|
9a202a393e
|
商户bug修改
|
4 years ago |
廖金灵
|
8cca85de27
|
Merge branch 'hotfix/market_percentage' of wmtx/platform into release
商户bug修改
|
4 years ago |
zhengyongxing
|
ee5fc4c7c8
|
Merge branch 'release' of 47.111.118.107:wmtx/platform into hotfix/market_percentage
Conflicts:
Application/Admin/View/Spend/lists.html
|
4 years ago |
zhengyongxing
|
9670bf86b6
|
商户bug修改
|
4 years ago |
廖金灵
|
6faa6e0a33
|
Merge branch 'feature/finance_statement723' of wmtx/platform into release
优化订单列表长cp订单显示
|
4 years ago |
廖金灵
|
7340d5b4fd
|
Merge branch 'hotfix/market_percentage' of wmtx/platform into release
手机号码重复验证
|
4 years ago |
chenzhi
|
2a99226dd7
|
优化订单列表长cp订单显示
|
4 years ago |
zhengyongxing
|
45d124b4cd
|
手机号码重复验证
|
4 years ago |
廖金灵
|
47c565e31c
|
Merge branch 'hotfix/market_percentage' of wmtx/platform into release
下游公司字段与上游公司字段一致
|
4 years ago |
zhengyongxing
|
57903e8a13
|
下游公司字段与上游公司字段一致
|
4 years ago |
廖金灵
|
f49865d243
|
Merge branch 'feature/payment_merchant' of wmtx/platform into release
商户配置
|
4 years ago |
廖金灵
|
c3417bdd83
|
Merge branch 'feature/deposit' of wmtx/platform into release
会长押金修改
|
4 years ago |
ELF
|
edb090feca
|
解决冲突
|
4 years ago |
ELF
|
004b540a63
|
解决冲突
|
4 years ago |
廖金灵
|
7ddf61e536
|
Merge branch 'feature/reward' of wmtx/platform into release
奖惩修改
|
4 years ago |
ELF
|
0803b686c3
|
解决冲突
|
4 years ago |
廖金灵
|
5bf4e4af67
|
Merge branch 'feature/promote_base_info' of wmtx/platform into release
推广员个人信息
|
4 years ago |