luoyang
|
3ff88287bf
|
Merge branch 'rpay_merchant_change' into develop
# Conflicts:
# src/main/java/au/com/royalpay/payment/manage/merchants/core/ClientManager.java
# src/main/java/au/com/royalpay/payment/manage/merchants/core/impls/ClientManagerImpl.java
# src/main/java/au/com/royalpay/payment/manage/merchants/web/PartnerManageController.java
|
7 years ago |
kira
|
2436757e1d
|
update
|
7 years ago |
|
luoyang
|
93a4ff7bed
|
add 100%
|
7 years ago |
|
kira
|
d327dce76c
|
update
|
7 years ago |
|
kira
|
8f9954f2ee
|
Merge branch 'develop'
# Conflicts:
# src/main/ui/static/payment/partner/templates/partner_new_rate.html
# src/main/ui/static/templates/rpay/v1/payment.js
|
7 years ago |
yixian
|
7f8b16cd29
|
Merge remote-tracking branch 'origin/master'
|
7 years ago |
|
yixian
|
4398264977
|
image
|
7 years ago |
|
yixian
|
aa1b7ae21f
|
Merge remote-tracking branch 'origin/develop' into develop
|
7 years ago |
|
yixian
|
f3bfd8d0ec
|
img
|
7 years ago |
taylor.dang
|
92dd21c447
|
fix
|
7 years ago |
|
taylor.dang
|
90b71373d6
|
fix
|
7 years ago |
|
taylor.dang
|
977849df93
|
fix
|
7 years ago |
|
taylor.dang
|
45fd38b071
|
fix
|
7 years ago |
yangkai
|
f826867191
|
缩小抽奖奖励弹窗
|
7 years ago |
|
luoyang
|
1a4d406f03
|
add 65%
|
7 years ago |
|
luoyang
|
086873f98a
|
add 55%
|
7 years ago |
|
yangkai
|
ec30db765b
|
app图标cmsHost修改
|
7 years ago |
|
yangkai
|
0b70366c7e
|
添加app图标管理功能
|
7 years ago |
|
luoyang
|
6cd99c841c
|
fix merchant
|
7 years ago |
|
luoyang
|
de55f0b10c
|
fix merchant
|
7 years ago |
|
luoyang
|
48247667ef
|
add 40%
|
7 years ago |
|
kira
|
94c971baeb
|
Merge branch 'develop' of https://pms.globalfreepay.com/source/royalpay.manage into develop
|
7 years ago |
|
kira
|
6a368f7b65
|
add customerId
|
7 years ago |
|
luoyang
|
6929fa2ebb
|
fix rpay clearing html
|
7 years ago |
|
luoyang
|
aea70ff828
|
fix rpay clearing html
|
7 years ago |
|
luoyang
|
8667dbee0e
|
fix rpay clearing html
|
7 years ago |
|
kira
|
d215a7fa8a
|
fix
|
7 years ago |
|
kira
|
cd97e18810
|
maven
|
7 years ago |
|
kira
|
2f0816573f
|
Merge branch 'develop'
# Conflicts:
# src/main/java/au/com/royalpay/payment/manage/dev/core/impl/MerchantLocationServiceImpl.java
|
7 years ago |
|
luoyang
|
962fb6c192
|
fix rpay merchant Id displayname
|
7 years ago |
|
luoyang
|
7ba97fe686
|
fix properties +rpay
|
7 years ago |
|
luoyang
|
8c5e51982d
|
add 10%
|
7 years ago |
|
taylor.dang
|
5880537788
|
Merge remote-tracking branch 'origin/develop' into develop
|
7 years ago |
|
taylor.dang
|
ea3ba4a5e0
|
fix
|
7 years ago |
|
kira
|
ce3e896e89
|
add rpay merchant
|
7 years ago |
|
kira
|
98332d95a5
|
Merge remote-tracking branch 'origin/develop' into develop
# Conflicts:
# src/main/java/au/com/royalpay/payment/manage/merchants/core/impls/ClientManagerImpl.java
# src/main/java/au/com/royalpay/payment/manage/merchants/web/PartnerManageController.java
# src/main/resources/application-rpay.properties
# src/main/ui/static/payment/partner/partner-manage.js
# src/main/ui/static/payment/partner/templates/sub_merchant_id_apply.html
|
7 years ago |
|
kira
|
09755b167c
|
modify
|
7 years ago |
|
luoyang
|
49548f0137
|
add 5%
|
7 years ago |
|
taylor.dang
|
ee0854002e
|
[Y] 商户地理位置定时任务
|
7 years ago |
|
taylor.dang
|
48c347a55a
|
[Y] 初始化商户地理位置信息
|
7 years ago |
|
taylor.dang
|
2ebe5a2eb7
|
[Y] 初始化商户地理位置信息
|
7 years ago |
|
kira
|
10a0a6f0ce
|
add rpay
|
7 years ago |
|
kira
|
43ab6507d6
|
tmp
|
7 years ago |
|
kira
|
4f73be6d88
|
Merge remote-tracking branch 'origin/develop_rpay' into develop_rpay
|
7 years ago |
|
kira
|
deebb88a2c
|
update
|
7 years ago |
|
taylor.dang
|
da29d53dc9
|
[Y] 新增恢复商户功能
|
7 years ago |
|
luoyang
|
4d1e4b3aa1
|
update revert partner
|
7 years ago |
|
luoyang
|
d6c4a5aafb
|
update modify.sql
|
7 years ago |
|
luoyang
|
1987cc09f8
|
update merchant
|
7 years ago |
|
kira
|
d416b2265f
|
tmp
|
7 years ago |
