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
|
8256b7989f
|
Merge branch 'hotfix' into develop
|
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 |
|
eason
|
fe7c194c81
|
Merge remote-tracking branch 'origin/develop' into develop
|
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 |
|
eason
|
fdea0b3d8d
|
Merge remote-tracking branch 'origin/develop' into develop
# Conflicts:
# src/main/java/au/com/royalpay/payment/manage/actchairty/core/impls/ActChairtyServiceImp.java
|
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 |
|
eason
|
493b44b013
|
Merge remote-tracking branch 'origin/develop' into develop
|
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 |
|
eason
|
7c064c70d8
|
Merge remote-tracking branch 'origin/develop' into develop
# Conflicts:
# src/main/java/au/com/royalpay/payment/manage/actchairty/core/impls/ActChairtyServiceImp.java
|
6 years ago |
|
eason
|
69a40a53c6
|
Merge branch 'hotfix' into develop
|
6 years ago |
|
kira
|
735aaadc27
|
update
|
6 years ago |
|
eason
|
77bb3ea3b5
|
fix actChairty
|
6 years ago |
|
luoyang14z7
|
2ef48835b7
|
fix : ActChairty
|
6 years ago |
