luoyang
|
78ff2e2df1
|
Merge branch 'develop_app_0307' into develop
# Conflicts:
# src/main/ui/manage.html
# src/main/ui/static/menu/templates/main_menu.html
# src/main/ui/static/payment/partner/partner-manage.js
|
6 years ago |
|
luoyang
|
09db19f7ee
|
tmp commit
|
6 years ago |
taylor.dang
|
72d1fe2f18
|
修复清算报表无法下载情况
|
6 years ago |
|
luoyang
|
d5c5aa2208
|
tmp commit
|
6 years ago |
|
luoyang
|
6db59b59d1
|
fix 合伙人提成 减掉surcharge_cashback
|
6 years ago |
|
luoyang
|
02fd5da0cc
|
Merge remote-tracking branch 'origin/develop' into develop
|
6 years ago |
|
luoyang
|
0db91f904d
|
fix 合伙人提成 减掉surcharge_cashback
|
6 years ago |
|
taylor.dang
|
1ad4c6ec52
|
登录异常信息日志
|
6 years ago |
|
taylor.dang
|
460fe9a28d
|
新增异常信息日志
|
6 years ago |
|
luoyang
|
f222cc265d
|
tmp commit
|
6 years ago |
|
luoyang
|
ca8992219c
|
fix
|
6 years ago |
|
luoyang
|
2291ddcede
|
add 测试密码增加签名
|
6 years ago |
|
luoyang
|
8431d55341
|
测试密码微信模板 增加签名
|
6 years ago |
|
luoyang
|
72c7ae90f6
|
tmp commit
|
6 years ago |
|
taylor.dang
|
bc30a86d48
|
ignore
|
6 years ago |
|
taylor.dang
|
3db0c13c7d
|
inspiry设备管理
|
6 years ago |
|
taylor.dang
|
68ce23af11
|
默认设备类型
|
6 years ago |
|
taylor.dang
|
a658c1958f
|
新增添加pos设备
|
6 years ago |
|
luoyang
|
e25bbbbc53
|
fix
|
6 years ago |
|
luoyang
|
f585288e68
|
fix
|
6 years ago |
|
luoyang
|
9f1394df88
|
add 风控业务事件增加模板选择
|
6 years ago |
|
luoyang
|
dc87e9b82e
|
add 风控业务事件增加模板选择
|
6 years ago |
lujian
|
58c4947aa5
|
Merge remote-tracking branch 'origin/develop' into develop
|
6 years ago |
|
lujian
|
a9b363fddf
|
Inspiry设备管理
|
6 years ago |
|
luoyang
|
f80f532c01
|
fix
|
6 years ago |
|
luoyang
|
759ac52efe
|
add 提成规则页面
|
6 years ago |
yangkai
|
d5571a8b59
|
BD规则说明更新
|
6 years ago |
|
lujian
|
83916a28fc
|
Merge remote-tracking branch 'origin/develop' into develop
|
6 years ago |
|
lujian
|
3c221c1cd6
|
Merge branch 'develop' of D:\globalpay\9009_manage_develop\royalpay.manage with conflicts.
|
6 years ago |
|
luoyang
|
d799f1d43e
|
fix
|
6 years ago |
|
luoyang
|
65c5bda2ad
|
fix
|
6 years ago |
|
luoyang
|
26487813fc
|
fix representative_id
|
6 years ago |
|
luoyang
|
222edd4ba8
|
fix representative_id
|
6 years ago |
|
luoyang
|
c6d46a8b8f
|
fix representative_id
|
6 years ago |
|
luoyang
|
82d2385fde
|
tmp commit
|
6 years ago |
|
luoyang
|
1957b7775b
|
fix
|
6 years ago |
|
luoyang
|
75c68d965a
|
fix
|
6 years ago |
|
luoyang
|
5f726c71ec
|
Merge branch 'develop'
|
6 years ago |
|
luoyang
|
20d0b6dcdf
|
Merge branch 'master_alipay_gms' into develop
# Conflicts:
# src/main/java/au/com/royalpay/payment/manage/dev/web/TestMerchantPassword.java
|
6 years ago |
|
luoyang
|
bc2b86ad24
|
commit prod 测试
|
6 years ago |
|
luoyang
|
cffd93f282
|
temp commit
|
6 years ago |
yixian
|
7ad3c813a0
|
revoke settlement pay back to distributed surcharge
|
6 years ago |
|
luoyang
|
3c19d2ae93
|
temp commit
|
6 years ago |
|
taylor.dang
|
bf9b1464b6
|
Merge branch 'develop'
|
6 years ago |
|
taylor.dang
|
4e150e4555
|
update
|
6 years ago |
|
yixian
|
c8fd66d3ad
|
hanyin reports
|
6 years ago |
james.zhao
|
c6272ac13f
|
fix bug
|
6 years ago |
|
james.zhao
|
4ef824cef5
|
Merge remote-tracking branch 'origin/develop'
|
6 years ago |
|
james.zhao
|
bd6b088f52
|
fix
|
6 years ago |
|
james.zhao
|
378b152792
|
Merge remote-tracking branch 'origin/develop'
|
6 years ago |
