kira
|
cc766351ad
|
add customer service
|
7 years ago |
eason
|
f7c0f165cd
|
fix encourage css
|
7 years ago |
|
eason
|
9999f0de43
|
fix 自定义商户费率
|
7 years ago |
|
kira
|
405fdda8d2
|
Merge branch 'develop' of https://pms.globalfreepay.com/source/royalpay.manage into develop
|
7 years ago |
|
kira
|
9e0ec85b81
|
Merge branch 'refundList' into develop
# Conflicts:
# src/main/java/au/com/royalpay/payment/manage/appclient/core/RetailAppService.java
# src/main/java/au/com/royalpay/payment/manage/appclient/core/impls/RetailAppServiceImp.java
|
7 years ago |
|
kira
|
43abd4d5b1
|
add pos refund list
|
7 years ago |
|
kira
|
d0df62162f
|
customer tmp
|
7 years ago |
|
eason
|
29cf97ad89
|
fix encourage
|
7 years ago |
|
kira
|
8579b406d3
|
update
|
7 years ago |
yuan
|
7d24d1d063
|
fix bug
|
7 years ago |
|
yuan
|
6e2e5f2335
|
fix html
|
7 years ago |
|
yuan
|
5e812e933f
|
fix attention merchants
|
7 years ago |
|
yuan
|
20f15d7c64
|
fix Accounts
|
7 years ago |
|
kira
|
87bae39ecc
|
add
|
7 years ago |
|
kira
|
a6245606a5
|
tmp
|
7 years ago |
|
kira
|
79cfa5085f
|
Merge branch 'master' of https://pms.globalfreepay.com/source/royalpay.manage
|
7 years ago |
|
kira
|
6cf637bfec
|
Merge branch 'develop' of https://pms.globalfreepay.com/source/royalpay.manage into develop
|
7 years ago |
|
kira
|
10bef3722d
|
Merge branch 'hotfix' into develop
|
7 years ago |
|
kira
|
caef37d544
|
Merge branch 'hotfix'
|
7 years ago |
|
kira
|
3e2a90f4c6
|
update
|
7 years ago |
|
eason
|
b2e5d7dff6
|
Merge branch 'hotfix2' into develop
|
7 years ago |
|
eason
|
5ef0ca18fe
|
fix
|
7 years ago |
|
kira
|
53cbcc816f
|
Merge branch 'hotfix' into develop
|
7 years ago |
|
kira
|
d952777873
|
update
|
7 years ago |
|
kira
|
f3e074bb6b
|
Merge branch 'master' of https://pms.globalfreepay.com/source/royalpay.manage
|
7 years ago |
|
kira
|
1cceedf15a
|
Merge branch 'develop' of https://pms.globalfreepay.com/source/royalpay.manage into develop
|
7 years ago |
|
kira
|
788ea75b1b
|
Merge branch 'hotfix' into develop
|
7 years ago |
|
kira
|
d444c33349
|
update
|
7 years ago |
luoyang14z7
|
5695e312f0
|
fix : AliForExcel
|
7 years ago |
|
luoyang14z7
|
5b5085d410
|
fix : AliForExcel
|
7 years ago |
|
kira
|
7b1991f71e
|
add pom
|
7 years ago |
|
kira
|
f060e2fcd3
|
update
|
7 years ago |
|
kira
|
bedba86e89
|
Merge branch 'hotfix2' into develop
|
7 years ago |
|
kira
|
f52f59f4c6
|
update
|
7 years ago |
|
kira
|
e95d595528
|
update
|
7 years ago |
|
kira
|
7c99d32b14
|
update
|
7 years ago |
|
kira
|
5948cdaa9c
|
Merge branch 'hotfix' into develop
|
7 years ago |
|
kira
|
1cf58228e6
|
update
|
7 years ago |
|
kira
|
6d2662ded7
|
tmp
|
7 years ago |
|
kira
|
4c97b2cc8a
|
Merge branch 'develop_openim' into develop
# Conflicts:
# src/main/ui/manage.html
|
7 years ago |
|
kira
|
f4ffe14bfa
|
udpate
|
7 years ago |
|
kira
|
58ade45bca
|
Merge branch 'hotfix' into develop
|
7 years ago |
|
kira
|
26e0a05699
|
update encourage money desc
|
7 years ago |
|
kira
|
73ad418728
|
add customer service
|
7 years ago |
|
kira
|
ecfda6a9ad
|
Merge branch 'hotfix' into develop
# Conflicts:
# src/main/java/au/com/royalpay/payment/manage/customers/web/EncourageMoneyController.java
|
7 years ago |
|
kira
|
dce6f0e180
|
update img
|
7 years ago |
|
kira
|
4569c155e0
|
add default img
|
7 years ago |
|
kira
|
bb45fc0483
|
update encourage money head img
|
7 years ago |
|
eason
|
3696f360b5
|
Merge branch 'hotfix1' into develop
|
7 years ago |
|
eason
|
b4123e7f3f
|
fix encourage
|
7 years ago |
