wangning
|
3cf45ef0cc
|
Merge branch 'develop_manual_settle' into develop
# Conflicts:
# src/db/modify.sql
|
9 years ago |
|
wangning
|
243a085b44
|
add manual settle
|
9 years ago |
|
wangning
|
caadaa605d
|
update
|
9 years ago |
|
wangning
|
1b462fd599
|
update
|
9 years ago |
|
wangning
|
9981c2b36f
|
add acts log
|
9 years ago |
eason.qian
|
4a78305160
|
fix
|
9 years ago |
|
eason.qian
|
9bafbc56c2
|
Merge branch 'notice' into develop
# Conflicts:
# src/db/modify.sql
# src/main/java/au/com/royalpay/payment/manage/appclient/web/RetailAppController.java
|
9 years ago |
|
eason.qian
|
6eb7c8b64f
|
Merge branch 'mondelay' into develop
# Conflicts:
# src/db/modify.sql
# src/main/java/au/com/royalpay/payment/manage/appclient/web/RetailAppController.java
|
9 years ago |
|
eason.qian
|
288f7d5e1f
|
fix
|
9 years ago |
|
eason.qian
|
88126bd581
|
fix
|
9 years ago |
|
eason.qian
|
f39c80b2d6
|
fix
|
9 years ago |
|
eason.qian
|
8e886dec43
|
fix
|
9 years ago |
|
eason.qian
|
08426e8a5a
|
fix
|
9 years ago |
|
eason.qian
|
df01e3f59b
|
fix
|
9 years ago |
|
eason.qian
|
d2ef9d0c25
|
Merge branch 'master' of /Users/yishuqian/Documents/workspace/royalpay/royalv2.manage with conflicts.
|
9 years ago |
|
wangning
|
1fe41d5421
|
update
|
9 years ago |
|
eason.qian
|
0ea54d7191
|
fix
|
9 years ago |
|
wangning
|
ab94d60512
|
update
|
9 years ago |
|
wangning
|
b10606486b
|
update sql
|
9 years ago |
|
eason.qian
|
d99cdd94e0
|
fix
|
9 years ago |
|
eason.qian
|
dcd9c55f52
|
fix manager_id String
|
9 years ago |
|
macminiuser
|
8bacdb61ea
|
交易额+退款+退款+退款笔数+App流水接口、交易额相关接口调整
|
9 years ago |
|
wangning
|
6512c4d249
|
Merge branch 'update1' into develop
# Conflicts:
# src/db/modify.sql
# src/main/ui/static/analysis/org/templates/analysis_org.html
|
9 years ago |
|
wangning
|
2bea260aa0
|
Merge branch 'update' into develop
# Conflicts:
# src/db/modify.sql
|
9 years ago |
|
eason.qian
|
d3d0419c31
|
Merge remote-tracking branch 'origin/master'
# Conflicts:
# src/db/modify.sql
# src/main/ui/static/analysis/org/templates/analysis_org.html
|
9 years ago |
|
wangning
|
e391b89723
|
Merge branch 'mergeReferrer&CityPartner' into develop
# Conflicts:
# src/db/modify.sql
# src/main/ui/static/analysis/org/templates/analysis_org.html
|
9 years ago |
|
wangning
|
7e050369ee
|
Merge branch 'mergeReferrer&CityPartner'
# Conflicts:
# src/db/modify.sql
|
9 years ago |
|
eason.qian
|
613bfd0c30
|
fix
|
9 years ago |
|
wangning
|
7db3c20519
|
Merge branch 'weekReport' into develop
# Conflicts:
# src/db/modify.sql
|
9 years ago |
|
wangning
|
9d213a018c
|
合并冲突
|
9 years ago |
|
wangning
|
c1dff4cb09
|
Merge branch 'andriodReleaseNote' into develop
# Conflicts:
# src/db/modify.sql
|
9 years ago |
|
wangning
|
3f9ef5d8b1
|
Merge branch 'andriodReleaseNote' into mergeReferrer&CityPartner
# Conflicts:
# src/db/modify.sql
|
9 years ago |
|
wangning
|
f88ada4a20
|
andriod Release note
|
9 years ago |
|
wangning
|
2eea4ed50c
|
calculat type
|
9 years ago |
|
wangning
|
ea18e38234
|
tmp
|
9 years ago |
|
wangning
|
e245a6b44a
|
update sql
|
9 years ago |
|
eason.qian
|
edcca09eba
|
fix
|
9 years ago |
yuan
|
c964f93649
|
fix~
|
9 years ago |
|
wangning
|
f41e4c2ab7
|
update
|
9 years ago |
|
yuan
|
b7abc5b78f
|
商户详情里增加Local Merchant按钮
|
9 years ago |
|
eason.qian
|
0821e3ff32
|
fix
|
9 years ago |
|
wangning
|
69e4220698
|
phone top up Test demo
|
9 years ago |
|
wangning
|
1b48cd65f3
|
Customer impression
|
9 years ago |
|
eason.qian
|
b9b722b66f
|
fix
|
9 years ago |
|
wangning
|
71d62c4a20
|
update
|
9 years ago |
|
wangning
|
da4df801cb
|
update
|
9 years ago |
|
wangning
|
5c0292e3ad
|
sql
|
9 years ago |
|
wangning
|
93d5e2de71
|
update
|
9 years ago |
|
wangning
|
7e3489847c
|
modify client_rates column
|
9 years ago |
|
wangning
|
ee5684f586
|
modify approve column
|
9 years ago |
