kira
|
e1028366f0
|
update
|
6 years ago |
eason
|
d1a0ed322b
|
fix google map key
|
6 years ago |
|
eason
|
fc0e622c2b
|
Merge branch 'hotfix' into develop
|
6 years ago |
|
eason
|
19b1425aff
|
fix
|
6 years ago |
|
kira
|
58cf4e0fe0
|
update
|
6 years ago |
|
eason
|
b9398f2cfa
|
fix google map key
|
6 years ago |
|
kira
|
3b6609ad03
|
update
|
6 years ago |
|
kira
|
d6a91a1c03
|
remove log
|
6 years ago |
|
kira
|
f2632b9c43
|
update customer service headimg
|
6 years ago |
|
kira
|
2991b9ca03
|
Merge branch 'develop' of https://pms.globalfreepay.com/source/royalpay.manage into develop
|
6 years ago |
|
kira
|
dab1dbf73e
|
重构
|
6 years ago |
|
kira
|
1a73f48808
|
重构
|
6 years ago |
|
eason
|
3e082165ff
|
Merge remote-tracking branch 'origin/develop' into develop
|
6 years ago |
|
eason
|
abb86b3c3a
|
Merge branch 'h1' into develop
|
6 years ago |
|
eason
|
4f46380949
|
fix excel remark
|
6 years ago |
|
kira
|
5c19193c78
|
fixbug
|
6 years ago |
|
kira
|
016f5f94b1
|
update
|
6 years ago |
yixian
|
b7736f3318
|
split bank in download xlsx
|
6 years ago |
|
kira
|
4948539479
|
tmp
|
6 years ago |
|
kira
|
47549c0a9d
|
Merge branch 'master' of https://pms.globalfreepay.com/source/royalpay.manage
|
6 years ago |
|
kira
|
8b688159f6
|
Merge branch 'develop' of https://pms.globalfreepay.com/source/royalpay.manage into develop
|
6 years ago |
|
kira
|
7589d920a8
|
Merge branch 'hotfix' into develop
|
6 years ago |
|
kira
|
ef4752ef1a
|
remove Tommy mail adddress
|
6 years ago |
|
kira
|
cc623b1a21
|
update
|
6 years ago |
|
yixian
|
dd66355486
|
Merge remote-tracking branch 'origin/develop' into develop
|
6 years ago |
|
yixian
|
36ec9d4b6b
|
Merge remote-tracking branch 'origin/master'
|
6 years ago |
|
yixian
|
6325331f62
|
Merge branch 'hotfix_multibank' into develop
|
6 years ago |
|
yixian
|
de1c415a2d
|
split bank in download xlsx
|
6 years ago |
|
kira
|
64fea0ebfe
|
update
|
6 years ago |
|
kira
|
2456a8a6bb
|
Merge branch 'develop' of https://pms.globalfreepay.com/source/royalpay.manage into develop
|
6 years ago |
|
kira
|
0200731725
|
add test
|
6 years ago |
|
kira
|
8d3c0d5987
|
add timer task
|
6 years ago |
|
kira
|
de7b91a0eb
|
add wx msg
|
6 years ago |
yuan
|
f60eb253a6
|
Merge branch '7/23' into develop
|
6 years ago |
|
yuan
|
8e13ac7452
|
fix html
|
6 years ago |
|
yuan
|
2d3d56bbb1
|
Merge branch '7/23' into develop
|
6 years ago |
|
yuan
|
12a510e30e
|
fix html
|
6 years ago |
|
kira
|
791ec028fe
|
udpate
|
6 years ago |
|
kira
|
bd7459810a
|
update
|
6 years ago |
|
kira
|
35ff5437c0
|
update
|
6 years ago |
|
kira
|
a0e0827bc4
|
update
|
6 years ago |
|
kira
|
89d1d26a4a
|
update
|
6 years ago |
|
kira
|
e472c81f5e
|
Merge branch 'develop' of https://pms.globalfreepay.com/source/royalpay.manage into develop
|
6 years ago |
|
kira
|
1bab9c4423
|
add openim application
|
6 years ago |
|
eason
|
27f5898810
|
Merge branch 'hotfix11' into develop
|
6 years ago |
|
eason
|
1050937afc
|
fix hf channel show
|
6 years ago |
|
eason
|
8ce50ccc36
|
Merge branch 'fix1' into develop
|
6 years ago |
|
eason
|
76f0cec66d
|
fix transaction
|
6 years ago |
|
kira
|
fde8a601ea
|
add customer servant config
|
6 years ago |
|
kira
|
c658495834
|
Merge branch 'master' of https://pms.globalfreepay.com/source/royalpay.manage
|
6 years ago |
|
kira
|
92a9e2a1ca
|
Merge branch 'hotfix' into develop
# Conflicts:
# src/main/java/au/com/royalpay/payment/manage/customers/core/impls/EncourageUseProcessor.java
|
6 years ago |
|
kira
|
a3bf49708c
|
fixbug encourage money
|
6 years ago |
|
kira
|
cc766351ad
|
add customer service
|
6 years ago |
|
eason
|
f7c0f165cd
|
fix encourage css
|
6 years ago |
|
eason
|
9999f0de43
|
fix 自定义商户费率
|
6 years ago |
|
kira
|
405fdda8d2
|
Merge branch 'develop' of https://pms.globalfreepay.com/source/royalpay.manage into develop
|
6 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
|
6 years ago |
|
kira
|
43abd4d5b1
|
add pos refund list
|
6 years ago |
|
kira
|
d0df62162f
|
customer tmp
|
6 years ago |
|
eason
|
29cf97ad89
|
fix encourage
|
6 years ago |
|
kira
|
8579b406d3
|
update
|
6 years ago |
|
yuan
|
7d24d1d063
|
fix bug
|
6 years ago |
|
yuan
|
6e2e5f2335
|
fix html
|
6 years ago |
|
yuan
|
5e812e933f
|
fix attention merchants
|
6 years ago |
|
yuan
|
20f15d7c64
|
fix Accounts
|
6 years ago |
|
kira
|
87bae39ecc
|
add
|
6 years ago |
|
kira
|
a6245606a5
|
tmp
|
6 years ago |
|
kira
|
79cfa5085f
|
Merge branch 'master' of https://pms.globalfreepay.com/source/royalpay.manage
|
6 years ago |
|
kira
|
6cf637bfec
|
Merge branch 'develop' of https://pms.globalfreepay.com/source/royalpay.manage into develop
|
6 years ago |
|
kira
|
10bef3722d
|
Merge branch 'hotfix' into develop
|
6 years ago |
|
kira
|
caef37d544
|
Merge branch 'hotfix'
|
6 years ago |
|
kira
|
3e2a90f4c6
|
update
|
6 years ago |
|
eason
|
b2e5d7dff6
|
Merge branch 'hotfix2' into develop
|
6 years ago |
|
eason
|
5ef0ca18fe
|
fix
|
6 years ago |
|
kira
|
53cbcc816f
|
Merge branch 'hotfix' into develop
|
6 years ago |
|
kira
|
d952777873
|
update
|
6 years ago |
|
kira
|
f3e074bb6b
|
Merge branch 'master' of https://pms.globalfreepay.com/source/royalpay.manage
|
6 years ago |
|
kira
|
1cceedf15a
|
Merge branch 'develop' of https://pms.globalfreepay.com/source/royalpay.manage into develop
|
6 years ago |
|
kira
|
788ea75b1b
|
Merge branch 'hotfix' into develop
|
6 years ago |
|
kira
|
d444c33349
|
update
|
6 years ago |
luoyang14z7
|
5695e312f0
|
fix : AliForExcel
|
6 years ago |
|
luoyang14z7
|
5b5085d410
|
fix : AliForExcel
|
6 years ago |
|
kira
|
f060e2fcd3
|
update
|
6 years ago |
|
kira
|
bedba86e89
|
Merge branch 'hotfix2' into develop
|
6 years ago |
|
kira
|
f52f59f4c6
|
update
|
6 years ago |
|
kira
|
e95d595528
|
update
|
6 years ago |
|
kira
|
7c99d32b14
|
update
|
6 years ago |
|
kira
|
5948cdaa9c
|
Merge branch 'hotfix' into develop
|
6 years ago |
|
kira
|
1cf58228e6
|
update
|
6 years ago |
|
kira
|
6d2662ded7
|
tmp
|
6 years ago |
|
kira
|
4c97b2cc8a
|
Merge branch 'develop_openim' into develop
# Conflicts:
# src/main/ui/manage.html
|
6 years ago |
|
kira
|
f4ffe14bfa
|
udpate
|
6 years ago |
|
kira
|
58ade45bca
|
Merge branch 'hotfix' into develop
|
6 years ago |
|
kira
|
26e0a05699
|
update encourage money desc
|
6 years ago |
|
kira
|
73ad418728
|
add customer service
|
6 years ago |
|
kira
|
ecfda6a9ad
|
Merge branch 'hotfix' into develop
# Conflicts:
# src/main/java/au/com/royalpay/payment/manage/customers/web/EncourageMoneyController.java
|
6 years ago |
|
kira
|
dce6f0e180
|
update img
|
6 years ago |
|
kira
|
4569c155e0
|
add default img
|
6 years ago |
|
kira
|
bb45fc0483
|
update encourage money head img
|
6 years ago |
|
eason
|
3696f360b5
|
Merge branch 'hotfix1' into develop
|
6 years ago |
|
eason
|
b4123e7f3f
|
fix encourage
|
6 years ago |
|
eason
|
0bf42064df
|
fix encourage
|
6 years ago |
|
eason
|
f8df5a6079
|
fix encourage
|
6 years ago |
|
eason
|
f133e71894
|
fix encourage
|
6 years ago |
|
eason
|
dd058ce25a
|
Merge branch 'hotfix1' into develop
# Conflicts:
# src/main/java/au/com/royalpay/payment/manage/customers/core/impls/EncourageUseProcessor.java
|
6 years ago |
|
eason
|
e7f96bcabb
|
encourage
|
6 years ago |
|
eason
|
1f188598a6
|
encourage
|
6 years ago |
|
eason
|
a59789984e
|
encourage log
|
6 years ago |
|
eason
|
cbc766d441
|
encourage log
|
6 years ago |
|
kira
|
0769799a01
|
Merge branch 'hotfix' into develop
|
6 years ago |
|
kira
|
470c234209
|
update
|
6 years ago |
|
kira
|
6e54e0cd66
|
Merge branch 'hotfix' into develop
|
6 years ago |
|
kira
|
21b3c4dd74
|
update
|
6 years ago |
|
kira
|
eed179214b
|
Merge branch 'hotfix' into develop
# Conflicts:
# src/main/java/au/com/royalpay/payment/manage/actchairty/core/impls/ActChairtyServiceImp.java
# src/main/java/au/com/royalpay/payment/manage/customers/web/EncourageMoneyController.java
# src/main/resources/au/com/royalpay/payment/manage/mappers/act/ActChairtyMapper.xml
# src/main/ui/static/actchairty/templates/act_chairty_merchants.html
|
6 years ago |
|
kira
|
de82418d70
|
encourage money
|
6 years ago |
|
yuan
|
bf0c4366b7
|
Merge remote-tracking branch 'origin/develop' into develop
|
6 years ago |
|
yuan
|
189e37f2a0
|
add risk merchants html
|
6 years ago |
|
yuan
|
5105bdc6d2
|
add risk merchants html
|
6 years ago |
|
luoyang14z7
|
4f596ec1d3
|
fix : ActChairty
|
6 years ago |
|
luoyang14z7
|
45629cb0de
|
fix : ActChairty
|
6 years ago |
|
luoyang14z7
|
9e8f4f0b08
|
Merge remote-tracking branch 'master/develop' into develop
|
6 years ago |
|
kira
|
b69737a554
|
update
|
6 years ago |
|
kira
|
ed032015bc
|
update
|
6 years ago |
|
kira
|
735aaadc27
|
update
|
6 years ago |
|
eason
|
77bb3ea3b5
|
fix actChairty
|
6 years ago |
|
luoyang14z7
|
2ef48835b7
|
fix : ActChairty
|
6 years ago |
|
luoyang14z7
|
af40eff1b5
|
fix : ActChairty
|
6 years ago |
|
kira
|
bd7786e40f
|
Merge branch 'develop' of https://pms.globalfreepay.com/source/royalpay.manage into develop
|
6 years ago |
|
kira
|
a2c3128cb0
|
add log
|
6 years ago |
|
luoyang14z7
|
b182cb794b
|
fix : ActChairty
|
6 years ago |
|
luoyang14z7
|
b3d57f7bd9
|
fix : ActChairty
|
6 years ago |
|
kira
|
c18da355f0
|
update
|
6 years ago |
|
kira
|
70e234eff7
|
update act images
|
6 years ago |
|
kira
|
106c9b98c6
|
update
|
6 years ago |
|
kira
|
2d530b36c8
|
update act images
|
6 years ago |
|
eason
|
446f394428
|
fix encourage
|
6 years ago |
|
luoyang14z7
|
dbfa229946
|
fix : ActChairty
|
6 years ago |
|
luoyang14z7
|
ef3cd5d822
|
fix : ActChairty
|
6 years ago |
|
luoyang14z7
|
d5a2bfcb6f
|
fix : ActChairty
|
6 years ago |
|
kira
|
125b1eda8d
|
Merge branch 'master' of https://pms.globalfreepay.com/source/royalpay.manage
|
6 years ago |
|
kira
|
afbb87fe0e
|
update
|
6 years ago |
|
yuan
|
48227e3705
|
Merge remote-tracking branch 'origin/master'
|
6 years ago |
|
yuan
|
69a8655128
|
fix html
|
6 years ago |
|
kira
|
119830f78c
|
update act images
|
6 years ago |
|
kira
|
8db86c6534
|
update act images
|
6 years ago |
|
kira
|
c9bfd87714
|
update
|
6 years ago |
|
kira
|
026265fbaf
|
fix
|
6 years ago |
|
kira
|
f9bde28cb7
|
update sql
|
6 years ago |
|
kira
|
db1298a2d7
|
Merge branch 'develop' of https://pms.globalfreepay.com/source/royalpay.manage into develop
|
6 years ago |
|
kira
|
a7b3e33ada
|
update
|
6 years ago |
|
yuan
|
f41822308f
|
Merge remote-tracking branch 'origin/develop' into develop
|
6 years ago |
|
yuan
|
26d1390bcd
|
fix html
|
6 years ago |
|
kira
|
337ce2f305
|
Merge branch 'develop' of https://pms.globalfreepay.com/source/royalpay.manage into develop
|
6 years ago |
|
kira
|
b0fb825888
|
Merge branch 'hotfix' into develop
|
6 years ago |
|
kira
|
f7a78e6aac
|
update chairty image
|
6 years ago |
|
kira
|
954b9b6fd2
|
tmp
|
6 years ago |
|
eason
|
4a170a5f94
|
fix
|
6 years ago |
|
yuan
|
0a946ac1db
|
Merge remote-tracking branch 'origin/develop' into develop
|
6 years ago |
|
yuan
|
4291a53304
|
fix html
|
6 years ago |
|
luoyang14z7
|
fc4646a770
|
fix : chairty
|
6 years ago |
|
kira
|
b3f1d26e7c
|
tmp
|
6 years ago |
|
kira
|
052fce1894
|
tmp
|
6 years ago |
|
kira
|
170b78cc45
|
Merge branch 'develop' of https://pms.globalfreepay.com/source/royalpay.manage into develop
|
6 years ago |
|
kira
|
d61807c470
|
Merge branch 'hotfix' into develop
|
6 years ago |
|
kira
|
3b388a57b2
|
fixbug unread notice
|
6 years ago |
|
eason
|
eddd735c9c
|
commission
|
6 years ago |
|
eason
|
413f38b1af
|
Merge remote-tracking branch 'origin/develop' into develop
# Conflicts:
# src/db/modify.sql
|
6 years ago |
|
luoyang14z7
|
bc381cf03a
|
add : modify.sql
|
6 years ago |
|
kira
|
2416999408
|
update
|
6 years ago |
|
luoyang14z7
|
dc9a21b07f
|
fix : develop_act_Chairty
|
6 years ago |
|
eason
|
e4eac97729
|
Merge branch 'new_bd_commissions' into develop
|
6 years ago |
|
kira
|
ed42133822
|
Merge branch 'develop_client_permission' into develop
|
6 years ago |
|
kira
|
59bb6d7160
|
tmp
|
6 years ago |
|
luoyang14z7
|
48d5daf4ca
|
fix : develop_act_Chairty
|
6 years ago |
|
luoyang14z7
|
3cd97ffbde
|
fix : develop_act_Chairty
|
6 years ago |
|
kira
|
8a5a0b0237
|
Merge branch 'develop_client_permission' into develop
|
6 years ago |
|
kira
|
0c76b953a6
|
init
|
6 years ago |
|
luoyang14z7
|
0bbd6b8297
|
fix : develop_act_Chairty
|
6 years ago |
|
luoyang14z7
|
df14273f57
|
fix : develop_act_Chairty
|
6 years ago |
|
eason
|
af744d6efb
|
fix
|
6 years ago |
|
kira
|
9b7e268788
|
Merge branch 'develop_client_permission' into develop
|
6 years ago |
|
luoyang14z7
|
d490fbc865
|
add : develop_act_Chairty
|
6 years ago |
|
yuan
|
4ffb9f7bcd
|
Merge branch '7/10' into develop
|
6 years ago |
|
yuan
|
1aabaa91ad
|
move html
|
6 years ago |
|
yuan
|
3e48a1c82a
|
Merge branch '7/10' into develop
|
6 years ago |
|
yuan
|
ba846d542b
|
add html
|
6 years ago |
|
wangning
|
ec4fe4976e
|
Merge branch 'hotfix' into develop
|
6 years ago |
|
wangning
|
9ea819a9df
|
add act charity
|
6 years ago |
|
wangning
|
6c7d02be00
|
update
|
6 years ago |
|
yuan
|
b2533ca349
|
fix BD Commissions
|
6 years ago |
|
wangning
|
df0616707e
|
update 文案
|
6 years ago |
|
wangning
|
8523b40ffb
|
udpate
|
6 years ago |
|
wangning
|
82df945256
|
update
|
6 years ago |
|
luoyang14z7
|
08b1230f4f
|
Merge remote-tracking branch 'work/develop_client_permission' into develop_client_permission
|
6 years ago |
|
luoyang14z7
|
8f7d5f42c5
|
fix : develop_client_permission
|
6 years ago |
|
wangning
|
9ca8f47d09
|
Merge branch 'develop_client_permission' of https://git.royalpay.com.au/git/royalv2.manage into develop_client_permission
|
6 years ago |
|
yuan
|
0a13bcd876
|
fix BD Commissions
|
6 years ago |
|
wangning
|
5ad385d8af
|
Merge branch 'develop' into develop_client_permission
|
6 years ago |
|
luoyang14z7
|
93ae3a7275
|
fix : develop_client_permission
|
6 years ago |
|
luoyang14z7
|
77e0bc1044
|
Merge remote-tracking branch 'work/develop_client_permission' into develop_client_permission
|
6 years ago |
|
luoyang14z7
|
2cec4309b5
|
fix : develop_client_permission
|
6 years ago |
|
wangning
|
71303e4629
|
Merge branch 'hotfix' into develop
|
6 years ago |
|
wangning
|
6e049b7dcb
|
add images
|
6 years ago |
|
luoyang14z7
|
9e5e07daef
|
add : addPartner Auto Permission_Modules_Client
|
6 years ago |
|
eason
|
9d39e2cad6
|
fix
|
6 years ago |
|
wangning
|
9448ee6bb2
|
add permission check
|
6 years ago |
|
yuan
|
0e5e7270dc
|
fix BD Commissions
|
6 years ago |
|
wangning
|
ac472773f6
|
update
|
6 years ago |
|
wangning
|
2b3671a8af
|
merge
|
6 years ago |
|
wangning
|
fdab9c1d4c
|
Merge branch 'develop' into develop_client_permission
|
6 years ago |
|
luoyang14z7
|
1adf649076
|
add : partner Permission
|
6 years ago |
|
wangning
|
2de776e4ca
|
update
|
6 years ago |
|
yuan
|
c86e760dc8
|
fix BD Commissions
|
6 years ago |
|
eason
|
ac40e858da
|
fix bd commission
|
6 years ago |
|
wangning
|
4b53fee85c
|
update
|
6 years ago |
|
wangning
|
6b429eddb9
|
update
|
6 years ago |
|
wangning
|
208ac577c3
|
update
|
6 years ago |
|
wangning
|
cd50cbf719
|
add cache clearing
|
6 years ago |
|
wangning
|
6c752a3e0b
|
add client permission page
|
6 years ago |
|
yuan
|
9b031f73bb
|
fix BD Commissions
|
6 years ago |
|
wangning
|
9d50f0c687
|
tmp
|
6 years ago |
|
wangning
|
dfdb0bcac2
|
Merge branch 'hotfix' into develop
|
6 years ago |
|
wangning
|
33c477a30c
|
fixedDocument
|
6 years ago |
|
wangning
|
80332ebeac
|
tmp
|
6 years ago |
|
wangning
|
36cac76a91
|
tmp
|
6 years ago |
|
eason
|
216c4d072c
|
fix
|
6 years ago |
|
yuan
|
a4fb797cf0
|
fix bug
|
6 years ago |
|
eason
|
103ca68c2d
|
fix
|
6 years ago |
|
luoyang14z7
|
6454b39f91
|
注释auto add partner
|
6 years ago |
|
luoyang14z7
|
1ecbc4894f
|
Merge branch 'devtools' into develop
|
6 years ago |
|
eason
|
309568e67f
|
fix
|
6 years ago |
|
luoyang14z7
|
ec3139d99c
|
devtools:addaliexport
|
6 years ago |
|
luoyang14z7
|
9e9f472f3d
|
devtools : add
|
6 years ago |
|
luoyang14z7
|
f70ead46a9
|
devtools
|
6 years ago |
|
yuan
|
1781257140
|
fix bug
|
6 years ago |
|
yuan
|
479009d671
|
fix bug
|
6 years ago |
|
yuan
|
4ba4599b06
|
fix bug
|
6 years ago |
|
yuan
|
a22d860bd4
|
fix bug
|
6 years ago |
|
yuan
|
d163eb9949
|
增加hf pay intro
|
6 years ago |
|
wangning
|
750a821917
|
update
|
6 years ago |
|
eason
|
dceadcfa6f
|
fix
|
6 years ago |
|
yuan
|
e598d77925
|
增加hfindustry
|
6 years ago |
|
eason
|
20360ade11
|
fix hf css
|
6 years ago |
|
eason
|
573e3da805
|
Merge remote-tracking branch 'origin/develop' into develop
|
6 years ago |
|
eason
|
6c1497b81e
|
fix hf css
|
6 years ago |
|
wangning
|
62e2850ce8
|
add hf apidoc
|
6 years ago |
|
wangning
|
ab085e657d
|
Merge remote-tracking branch 'origin/develop' into develop
|
6 years ago |
|
eason
|
212f9411d7
|
fix hf css
|
6 years ago |
|
eason
|
877163f09c
|
Merge remote-tracking branch 'origin/develop' into develop
|
6 years ago |
|
eason
|
91bcf7f9b3
|
fix hf
|
6 years ago |
