eason
|
0bf42064df
|
fix encourage
|
8 years ago |
|
eason
|
f8df5a6079
|
fix encourage
|
8 years ago |
|
eason
|
f133e71894
|
fix encourage
|
8 years ago |
|
eason
|
dd058ce25a
|
Merge branch 'hotfix1' into develop
# Conflicts:
# src/main/java/au/com/royalpay/payment/manage/customers/core/impls/EncourageUseProcessor.java
|
8 years ago |
|
eason
|
8256b7989f
|
Merge branch 'hotfix' into develop
|
8 years ago |
|
eason
|
e7f96bcabb
|
encourage
|
8 years ago |
|
eason
|
1f188598a6
|
encourage
|
8 years ago |
|
eason
|
a59789984e
|
encourage log
|
8 years ago |
|
eason
|
cbc766d441
|
encourage log
|
8 years ago |
|
eason
|
fe7c194c81
|
Merge remote-tracking branch 'origin/develop' into develop
|
8 years ago |
kira
|
0769799a01
|
Merge branch 'hotfix' into develop
|
8 years ago |
|
kira
|
470c234209
|
update
|
8 years ago |
|
kira
|
6e54e0cd66
|
Merge branch 'hotfix' into develop
|
8 years ago |
|
kira
|
21b3c4dd74
|
update
|
8 years ago |
|
eason
|
fdea0b3d8d
|
Merge remote-tracking branch 'origin/develop' into develop
# Conflicts:
# src/main/java/au/com/royalpay/payment/manage/actchairty/core/impls/ActChairtyServiceImp.java
|
8 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
|
8 years ago |
|
kira
|
de82418d70
|
encourage money
|
8 years ago |
|
eason
|
493b44b013
|
Merge remote-tracking branch 'origin/develop' into develop
|
8 years ago |
yuan
|
bf0c4366b7
|
Merge remote-tracking branch 'origin/develop' into develop
|
8 years ago |
|
yuan
|
189e37f2a0
|
add risk merchants html
|
8 years ago |
|
yuan
|
5105bdc6d2
|
add risk merchants html
|
8 years ago |
luoyang14z7
|
4f596ec1d3
|
fix : ActChairty
|
8 years ago |
|
luoyang14z7
|
45629cb0de
|
fix : ActChairty
|
8 years ago |
|
luoyang14z7
|
9e8f4f0b08
|
Merge remote-tracking branch 'master/develop' into develop
|
8 years ago |
|
kira
|
b69737a554
|
update
|
8 years ago |
|
kira
|
ed032015bc
|
update
|
8 years ago |
|
eason
|
7c064c70d8
|
Merge remote-tracking branch 'origin/develop' into develop
# Conflicts:
# src/main/java/au/com/royalpay/payment/manage/actchairty/core/impls/ActChairtyServiceImp.java
|
8 years ago |
|
eason
|
69a40a53c6
|
Merge branch 'hotfix' into develop
|
8 years ago |
|
kira
|
735aaadc27
|
update
|
8 years ago |
|
eason
|
77bb3ea3b5
|
fix actChairty
|
8 years ago |
|
luoyang14z7
|
2ef48835b7
|
fix : ActChairty
|
8 years ago |
|
luoyang14z7
|
af40eff1b5
|
fix : ActChairty
|
8 years ago |
|
kira
|
bd7786e40f
|
Merge branch 'develop' of https://pms.globalfreepay.com/source/royalpay.manage into develop
|
8 years ago |
|
kira
|
a2c3128cb0
|
add log
|
8 years ago |
|
luoyang14z7
|
b182cb794b
|
fix : ActChairty
|
8 years ago |
|
luoyang14z7
|
b3d57f7bd9
|
fix : ActChairty
|
8 years ago |
|
kira
|
c18da355f0
|
update
|
8 years ago |
|
kira
|
70e234eff7
|
update act images
|
8 years ago |
|
kira
|
106c9b98c6
|
update
|
8 years ago |
|
kira
|
2d530b36c8
|
update act images
|
8 years ago |
|
eason
|
8becd67cf0
|
fix pom dev
|
8 years ago |
|
eason
|
446f394428
|
fix encourage
|
8 years ago |
|
luoyang14z7
|
dbfa229946
|
fix : ActChairty
|
8 years ago |
|
luoyang14z7
|
ef3cd5d822
|
fix : ActChairty
|
8 years ago |
|
luoyang14z7
|
348b4e5e74
|
Merge branch 'actCh' into develop
|
8 years ago |
|
luoyang14z7
|
d5a2bfcb6f
|
fix : ActChairty
|
8 years ago |
|
kira
|
125b1eda8d
|
Merge branch 'master' of https://pms.globalfreepay.com/source/royalpay.manage
|
8 years ago |
|
kira
|
e25b8f1da9
|
Merge branch 'develop' of https://pms.globalfreepay.com/source/royalpay.manage into develop
|
8 years ago |
|
kira
|
afbb87fe0e
|
update
|
8 years ago |
|
yuan
|
48227e3705
|
Merge remote-tracking branch 'origin/master'
|
8 years ago |
