yuan
|
3545b72406
|
add cancle_waring msg
|
7 years ago |
|
yuan
|
7cb99fbc0c
|
fix bug
|
7 years ago |
|
yuan
|
7a7f7c2319
|
modify html
|
7 years ago |
eason.qian
|
92646432d5
|
fix
|
7 years ago |
yixian
|
0e826d98d2
|
rule update
|
7 years ago |
|
yixian
|
211da4f69e
|
rule update
|
7 years ago |
|
yixian
|
d47830f7f9
|
find settle to
|
7 years ago |
|
eason.qian
|
d2ee955ca8
|
fix
|
7 years ago |
|
eason.qian
|
777a8c314e
|
Merge remote-tracking branch 'origin/master'
|
7 years ago |
|
eason.qian
|
34605db062
|
fix
|
7 years ago |
wangning
|
55c7a93439
|
Merge branch 'develop' of https://git.royalpay.com.au/git/royalv2.manage into develop
|
7 years ago |
|
wangning
|
beefaeccc0
|
Merge branch 'master' of https://git.royalpay.com.au/git/royalv2.manage
|
7 years ago |
|
wangning
|
7afbb7479f
|
fixbug
|
7 years ago |
|
eason.qian
|
44805b5c31
|
Merge remote-tracking branch 'origin/develop' into develop
|
7 years ago |
|
eason.qian
|
2287468292
|
fix
|
7 years ago |
|
wangning
|
e5a6813c91
|
update
|
7 years ago |
|
wangning
|
8698d78681
|
Merge branch 'develop' of https://git.royalpay.com.au/git/royalv2.manage into develop
|
7 years ago |
|
wangning
|
daee2f1a2e
|
update QR board
|
7 years ago |
|
yuan
|
3714c814c3
|
modify html
|
7 years ago |
|
wangning
|
cd60d89c40
|
unread interface add column msg_interval
|
7 years ago |
|
wangning
|
30d1c708f8
|
Partner Settlements Logs
|
7 years ago |
|
wangning
|
35c97f7182
|
Merge branch 'master' of https://git.royalpay.com.au/git/royalv2.manage
|
7 years ago |
|
wangning
|
7e35483150
|
update
|
7 years ago |
|
eason.qian
|
d5097ff363
|
Merge remote-tracking branch 'origin/develop' into develop
|
7 years ago |
|
eason.qian
|
0667724269
|
mu
|
7 years ago |
|
yuan
|
61152808b4
|
商户端增加提现功能
|
7 years ago |
|
yuan
|
8f14cb47a2
|
update
|
7 years ago |
|
yixian
|
c011802240
|
scale
|
7 years ago |
|
yixian
|
ba6e50ab5c
|
Merge remote-tracking branch 'origin/develop' into develop
# Conflicts:
# src/main/java/au/com/royalpay/payment/manage/settlement/core/impls/ManualSettleSupportImpl.java
|
7 years ago |
|
yixian
|
041746ef4e
|
scale
|
7 years ago |
|
eason.qian
|
3cbdaf0339
|
fix cache bug~
|
7 years ago |
|
wangning
|
558c9fd771
|
update
|
7 years ago |
|
wangning
|
a5608059ea
|
update
|
7 years ago |
|
wangning
|
0fea884bd1
|
update
|
7 years ago |
|
wangning
|
d41232822f
|
update
|
7 years ago |
|
wangning
|
f6d92dde3a
|
update
|
7 years ago |
|
wangning
|
9bd674275f
|
update
|
7 years ago |
|
wangning
|
f14dbf84ae
|
Merge branch 'develop' of https://git.royalpay.com.au/git/royalv2.manage into develop
|
7 years ago |
|
eason.qian
|
91bba5dea4
|
Merge remote-tracking branch 'origin/develop' into develop
|
7 years ago |
|
eason.qian
|
10bb3b1404
|
fix
|
7 years ago |
|
wangning
|
111073ba77
|
Merge branch 'master_contract_analysis' into develop
# Conflicts:
# src/db/modify.sql
# src/main/ui/manage.html
|
7 years ago |
|
wangning
|
69104c110c
|
update
|
7 years ago |
|
wangning
|
674235960d
|
Merge branch 'develop' of https://git.royalpay.com.au/git/royalv2.manage into develop
|
7 years ago |
|
wangning
|
bf8b17a5dc
|
Merge branch 'master_rate_cache' into develop
|
7 years ago |
|
wangning
|
27c5d25eb6
|
delete manager manual_settle
|
7 years ago |
|
eason.qian
|
373f024a57
|
fix
|
7 years ago |
|
eason.qian
|
d3d4b633fb
|
fix
|
7 years ago |
|
wangning
|
3cf45ef0cc
|
Merge branch 'develop_manual_settle' into develop
# Conflicts:
# src/db/modify.sql
|
7 years ago |
|
yixian
|
3f513ead4e
|
Merge branch 'manualsettle' into develop
|
7 years ago |
|
yixian
|
f11ccbc7cd
|
details
|
7 years ago |
|
wangning
|
a2b36ec297
|
update
|
7 years ago |
|
wangning
|
243a085b44
|
add manual settle
|
7 years ago |
|
yixian
|
69ecf574bd
|
Merge branch 'manualsettle' into develop
|
7 years ago |
|
yixian
|
4c6fbed61c
|
client
|
7 years ago |
|
yixian
|
241586966d
|
Merge remote-tracking branch 'origin/develop' into develop
|
7 years ago |
|
yixian
|
de40d0d0ea
|
manual settle request
|
7 years ago |
|
eason.qian
|
f1049e7cd9
|
Merge remote-tracking branch 'origin/develop' into develop
|
7 years ago |
|
eason.qian
|
18db21c9f6
|
fix
|
7 years ago |
|
wangning
|
0a87728a96
|
update
|
7 years ago |
|
yuan
|
41bdbdfe3c
|
fix bug
|
7 years ago |
|
wangning
|
4d2a27c2ca
|
update
|
7 years ago |
|
wangning
|
caadaa605d
|
update
|
7 years ago |
|
wangning
|
1b462fd599
|
update
|
7 years ago |
|
wangning
|
9981c2b36f
|
add acts log
|
7 years ago |
|
wangning
|
b6daea5821
|
Merge branch 'develop' of https://git.royalpay.com.au/git/royalv2.manage into develop
|
7 years ago |
|
yuan
|
c6ba497390
|
活动管理增加字段
|
7 years ago |
|
wangning
|
fbec5fbd56
|
update
|
7 years ago |
Tayl0r
|
dd90c988fb
|
[Y] 翼支付清算日期
|
7 years ago |
|
eason.qian
|
2c313cbf65
|
Merge remote-tracking branch 'origin/develop' into develop
|
7 years ago |
|
eason.qian
|
4a78305160
|
fix
|
7 years ago |
|
wangning
|
176b69d685
|
update
|
7 years ago |
|
wangning
|
5ed445e8a9
|
mondelay 周一18点之前停止操作
|
7 years ago |
|
yuan
|
bc82d0f6b7
|
fix html
|
7 years ago |
|
yuan
|
432067e046
|
fix~
|
7 years ago |
|
yuan
|
92be3cf81a
|
fix html
|
7 years ago |
|
wangning
|
7ea1050366
|
update
|
7 years ago |
|
wangning
|
7171a225d8
|
Merge branch 'develop' of https://git.royalpay.com.au/git/royalv2.manage into develop
|
7 years ago |
|
wangning
|
e319db47ef
|
unread add act info
|
7 years ago |
|
yuan
|
f8a17f97e9
|
fix html
|
7 years ago |
|
wangning
|
c4f482af8e
|
Merge branch 'develop' of https://git.royalpay.com.au/git/royalv2.manage into develop
|
7 years ago |
|
wangning
|
808e0b0be5
|
Merge branch 'update' into develop
|
7 years ago |
|
wangning
|
febc6bc5b1
|
adjust merchant QR code
|
7 years ago |
|
yuan
|
1c52f90c33
|
fix html
|
7 years ago |
|
yuan
|
19ebddcfe2
|
fix bug
|
7 years ago |
|
Tayl0r
|
a82412eae7
|
Revert "[Y] 暂时关闭活动"
This reverts commit 021386f
|
7 years ago |
|
Tayl0r
|
021386fd5c
|
[Y] 暂时关闭活动
|
7 years ago |
|
yixian
|
28933de278
|
代码优化
|
7 years ago |
|
eason.qian
|
1c3ace6ffd
|
Merge remote-tracking branch 'origin/develop' into develop
|
7 years ago |
|
eason.qian
|
2c0a360ddd
|
Merge branch 'mondelay' into develop
|
7 years ago |
|
yuan
|
bad6e6aebd
|
修改页面
|
7 years ago |
|
yuan
|
6dbad697c4
|
Merge remote-tracking branch 'origin/mondelay' into mondelay
|
7 years ago |
|
wangning
|
43ed9074c1
|
Merge branch 'develop' of https://git.royalpay.com.au/git/royalv2.manage into develop
|
7 years ago |
|
wangning
|
1f112c19f7
|
fixbug
|
7 years ago |
|
eason.qian
|
6125d8b0f2
|
Merge remote-tracking branch 'origin/develop' into develop
|
7 years ago |
|
eason.qian
|
9e6b60de72
|
fix
|
7 years ago |
|
wangning
|
9bc84b33a8
|
fixbug
|
7 years ago |
|
yuan
|
9ffb7c4bd1
|
显示规则
|
7 years ago |
|
eason.qian
|
b49f43c3bb
|
Merge branch 'mondelay' into develop
|
7 years ago |
|
eason.qian
|
9ac5b10c0b
|
Merge remote-tracking branch 'origin/mondelay' into mondelay
|
7 years ago |
|
eason.qian
|
df70c356c6
|
fix
|
7 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
|
7 years ago |
|
yuan
|
6daca4a0a9
|
Merge remote-tracking branch 'origin/mondelay' into mondelay
|
7 years ago |
|
yuan
|
68be8297b0
|
fix~
|
7 years ago |
|
eason.qian
|
52b844cc8a
|
Merge branch 'mondelay' into develop
|
7 years ago |
|
eason.qian
|
b7459efc5b
|
fix
|
7 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
|
7 years ago |
|
eason.qian
|
a887493153
|
fix
|
7 years ago |
|
eason.qian
|
1e984e8e68
|
fix
|
7 years ago |
|
yuan
|
42ea3adcd7
|
fix~
|
7 years ago |
|
eason.qian
|
f63f6bc001
|
fix
|
7 years ago |
|
eason.qian
|
ca1c61d666
|
fix
|
7 years ago |
|
wangning
|
6c201c3e18
|
rollbakc conrtract
|
7 years ago |
|
yuan
|
8ce79a8e16
|
增加活动开始与结束时间
|
7 years ago |
|
wangning
|
e99dbd910a
|
update
|
7 years ago |
|
eason.qian
|
288f7d5e1f
|
fix
|
7 years ago |
|
wangning
|
ca9f07c7f8
|
merge confilct
|
7 years ago |
|
wangning
|
e8e8716569
|
Merge branch 'master' of https://git.royalpay.com.au/git/royalv2.manage
|
7 years ago |
|
wangning
|
d3f35457b2
|
fixbug
|
7 years ago |
|
eason.qian
|
95c379892f
|
Merge remote-tracking branch 'origin/mondelay' into mondelay
|
7 years ago |
|
eason.qian
|
88126bd581
|
fix
|
7 years ago |
|
wangning
|
65d0ab888a
|
merge conflict
|
7 years ago |
|
wangning
|
74861c60f7
|
add unread interface
|
7 years ago |
|
eason.qian
|
f39c80b2d6
|
fix
|
7 years ago |
|
yuan
|
2bc68b8456
|
fix~
|
7 years ago |
|
eason.qian
|
0d8ad430ec
|
Merge remote-tracking branch 'origin/develop' into develop
|
7 years ago |
|
eason.qian
|
33a0a78bba
|
fix
|
7 years ago |
|
eason.qian
|
8e886dec43
|
fix
|
7 years ago |
|
wangning
|
5be8e21b81
|
update
|
7 years ago |
|
yuan
|
d30c1b7312
|
fix~
|
7 years ago |
|
yuan
|
fbdb61e884
|
add mondelay 后台管理，与app 活动页配置页面
|
7 years ago |
|
eason.qian
|
6df34df759
|
Merge branch 'develop'
# Conflicts:
# src/db/modify.sql
|
7 years ago |
|
eason.qian
|
c4324f1407
|
Merge remote-tracking branch 'origin/master'
|
7 years ago |
|
eason.qian
|
e234e5745f
|
fix 关闭合同提醒
|
7 years ago |
|
eason.qian
|
08426e8a5a
|
fix
|
7 years ago |
|
eason.qian
|
4ac5d4132c
|
Merge remote-tracking branch 'origin/mondelay' into mondelay
|
7 years ago |
|
eason.qian
|
950459e621
|
fix
|
7 years ago |
|
wangning
|
4a4e6ad61f
|
update
|
7 years ago |
|
wangning
|
ff4bcc07f5
|
Merge branch 'update' into develop
|
7 years ago |
|
wangning
|
9a5cd5fa85
|
Merge branch 'master' of https://git.royalpay.com.au/git/royalv2.manage
|
7 years ago |
|
wangning
|
cc94c56c5b
|
update
|
7 years ago |
|
wangning
|
92d2273f16
|
update
|
7 years ago |
|
yixian
|
39faf54c55
|
document update
|
7 years ago |
|
yixian
|
34d5e0121c
|
folder name update
|
7 years ago |
|
wangning
|
ab995db58f
|
Merge branch 'develop' of https://git.royalpay.com.au/git/royalv2.manage into develop
|
7 years ago |
|
wangning
|
5779c9c1d6
|
Merge branch 'mail' into develop
|
7 years ago |
|
wangning
|
2e4bf7f332
|
init mail add short_name
|
7 years ago |
|
yixian
|
7d7ef6f2e6
|
Merge remote-tracking branch 'origin/master'
|
7 years ago |
|
yixian
|
aa70140535
|
nap
|
7 years ago |
|
eason.qian
|
df01e3f59b
|
fix
|
7 years ago |
|
eason.qian
|
7f4f195fee
|
Merge remote-tracking branch 'origin/master'
|
7 years ago |
|
eason.qian
|
d2ef9d0c25
|
Merge branch 'master' of /Users/yishuqian/Documents/workspace/royalpay/royalv2.manage with conflicts.
|
7 years ago |
|
wangning
|
8d08151728
|
Merge branch 'develop' of https://git.royalpay.com.au/git/royalv2.manage into develop
|
7 years ago |
|
wangning
|
98843f0513
|
fixbug download contract
|
7 years ago |
|
wangning
|
5589d83f0d
|
add exchange rate cache
|
7 years ago |
|
yuan
|
9992cc0294
|
fix~
|
7 years ago |
|
yuan
|
b9d2fd2cf8
|
fix html
|
7 years ago |
|
wangning
|
3358eb269c
|
update
|
7 years ago |
|
wangning
|
8943d91097
|
fixbug contract greenchannel
|
7 years ago |
|
wangning
|
1fe41d5421
|
update
|
7 years ago |
|
eason.qian
|
0ea54d7191
|
fix
|
7 years ago |
|
yuan
|
df99ae3218
|
add title
|
7 years ago |
|
wangning
|
198b60e0d9
|
Merge branch 'develop_device_offline' into develop
# Conflicts:
# src/main/java/au/com/royalpay/payment/manage/merchants/core/impls/ClientManagerImpl.java
|
7 years ago |
|
wangning
|
f48ccb5325
|
add contract analysis webview
|
7 years ago |
|
wangning
|
3321310500
|
update
|
7 years ago |
|
wangning
|
7c760fe803
|
update
|
7 years ago |
|
wangning
|
e023b105e9
|
update
|
7 years ago |
|
wangning
|
3b056b4092
|
update
|
7 years ago |
|
wangning
|
bcaa7a85ff
|
update
|
7 years ago |
|
eason.qian
|
4d23abd2a3
|
fix
|
7 years ago |
|
eason.qian
|
7ee71d67e8
|
Merge branch 'agreement' into develop
|
7 years ago |
|
eason.qian
|
bce1995633
|
fix
|
7 years ago |
|
wangning
|
ab94d60512
|
update
|
7 years ago |
|
wangning
|
7ab8a06feb
|
updateupdate
|
7 years ago |
|
wangning
|
81fb75377f
|
update
|
7 years ago |
|
wangning
|
b10606486b
|
update sql
|
7 years ago |
|
wangning
|
c2b9fc6424
|
update
|
7 years ago |
|
wangning
|
f79085be54
|
update
|
7 years ago |
|
eason.qian
|
d99cdd94e0
|
fix
|
7 years ago |
|
eason.qian
|
b2fca795d0
|
fix
|
7 years ago |
|
wangning
|
55bad532b4
|
sign channel
|
7 years ago |
|
wangning
|
ff32f2cad2
|
update
|
7 years ago |
|
wangning
|
900f31a2c6
|
update
|
7 years ago |
|
wangning
|
8f5e2db5a5
|
update
|
7 years ago |
|
Tayl0r
|
4bd4820126
|
[Y] 修改上传文件大小
|
7 years ago |
|
wangning
|
e7785b4699
|
update
|
7 years ago |
|
wangning
|
3f604e71ac
|
Merge branch 'agreement' of https://git.royalpay.com.au/git/royalv2.manage into agreement
|
7 years ago |
|
eason.qian
|
d35b6af86d
|
Merge remote-tracking branch 'origin/agreement' into agreement
|
7 years ago |
|
eason.qian
|
e772fef8c3
|
new act
|
7 years ago |
|
wangning
|
65975c4f6e
|
update
|
7 years ago |
|
wangning
|
15fd0edfc5
|
update
|
7 years ago |
|
Tayl0r
|
be9380de3d
|
[Y] 合同测试生成
|
7 years ago |
|
wangning
|
7de1eed456
|
update
|
7 years ago |
|
wangning
|
759c752455
|
update
|
7 years ago |
|
wangning
|
1e380cc65a
|
update
|
7 years ago |
|
wangning
|
81ecb15c05
|
update
|
7 years ago |
|
wangning
|
7ee91fb885
|
update
|
7 years ago |
|
wangning
|
1731d9e973
|
update
|
7 years ago |
|
yuan
|
2e3ab4a7f0
|
Merge remote-tracking branch 'origin/mondelay' into mondelay
|
7 years ago |
|
yuan
|
fca8e8695c
|
fix~
|
7 years ago |
|
eason.qian
|
0be0167cc2
|
new act
|
7 years ago |
|
wangning
|
8127076865
|
Merge branch 'agreement' of https://git.royalpay.com.au/git/royalv2.manage into agreement
|
7 years ago |
|
yuan
|
f278517d63
|
add html
|
7 years ago |
|
wangning
|
fef08a3f58
|
update
|
7 years ago |
|
eason.qian
|
585401834b
|
new act
|
7 years ago |
|
wangning
|
1019f2ef9f
|
Merge branch 'develop_contract' into agreement
|
7 years ago |
|
wangning
|
863b7794e3
|
update
|
7 years ago |
|
yixian
|
b1bebb8d0f
|
web error
|
7 years ago |
|
yixian
|
d778ad622c
|
web error
|
7 years ago |
|
wangning
|
5db7294880
|
update
|
7 years ago |
|
eason.qian
|
93b4ac57b2
|
new act
|
7 years ago |
|
wangning
|
29d7835400
|
update
|
7 years ago |
|
eason.qian
|
92a9fb7482
|
new act
|
7 years ago |
|
wangning
|
206106caac
|
update
|
7 years ago |
|
wangning
|
25d6d34a3f
|
update
|
7 years ago |
|
wangning
|
115e2ffbee
|
contract
|
7 years ago |
|
eason.qian
|
5d79371788
|
new act
|
7 years ago |
|
eason.qian
|
cf805e51b8
|
new act
|
7 years ago |
|
eason.qian
|
392e1814e5
|
fix
|
7 years ago |
|
yixian
|
11a81ba7b6
|
Merge remote-tracking branch 'origin/develop' into develop
|
7 years ago |
|
yixian
|
de825dee0d
|
Merge branch 'hotfix_20180306_exporterror' into develop
|
7 years ago |
|
yixian
|
5c57271ea9
|
Merge remote-tracking branch 'origin/master'
|
7 years ago |
|
yixian
|
715f718092
|
export error
|
7 years ago |
|
eason.qian
|
a0df3ab9ee
|
Merge branch 'develop'
|
7 years ago |
|
eason.qian
|
b9c4d60607
|
Merge remote-tracking branch 'origin/develop' into develop
|
7 years ago |
|
eason.qian
|
188ee72cd0
|
fix
|
7 years ago |
|
yixian
|
7aae1e7c6b
|
Merge remote-tracking branch 'origin/develop' into develop
|
7 years ago |
|
yixian
|
b05de3e6ef
|
Merge branch 'hotfix20180306transdownload'
# Conflicts:
# src/main/ui/static/payment/tradelog/templates/partner_settlement_logs.html
|
7 years ago |
|
yixian
|
b93660ca9e
|
client support multiple settles in one day
|
7 years ago |
|
yixian
|
8df1425bd2
|
client support multiple settles in one day
|
7 years ago |
|
yixian
|
3e13c03215
|
client support multiple settles in one day
|
7 years ago |
|
yixian
|
b2dccadab2
|
client support multiple settles in one day
|
7 years ago |
|
wangning
|
0bcce4efbc
|
Merge branch 'master' of https://git.royalpay.com.au/git/royalv2.manage
|
7 years ago |
|
wangning
|
daae66eb96
|
Merge branch 'develop' of https://git.royalpay.com.au/git/royalv2.manage into develop
|
7 years ago |
|
wangning
|
3b7ff0c889
|
app udpate
|
7 years ago |
|
eason.qian
|
89a9c1c061
|
fix change logo
|
7 years ago |
|
wangning
|
6b20fe43d6
|
device off line
|
7 years ago |
|
eason.qian
|
cfb3070c49
|
fix
|
7 years ago |
|
wangning
|
1c471262e4
|
Merge branch 'master' of https://git.royalpay.com.au/git/royalv2.manage
|
7 years ago |
|
wangning
|
7df8eff2fd
|
fixbug
|
7 years ago |
|
yixian
|
84b0fdaa85
|
hide gst in customer's view
|
7 years ago |
|
yixian
|
ab82fb7661
|
Merge branch 'hotfix20180227gst'
|
7 years ago |
|
yixian
|
349416eda6
|
hide gst in customer's view
|
7 years ago |
|
yixian
|
cdb23f746b
|
Merge remote-tracking branch 'origin/master'
# Conflicts:
# src/main/java/au/com/royalpay/payment/manage/merchants/core/impls/ClientManagerImpl.java
|
7 years ago |
|
yixian
|
d273b75fbc
|
hide gst in customer's view
|
7 years ago |
|
yixian
|
9f70551e39
|
Merge branch 'hotfix20180227gst'
|
7 years ago |
|
yixian
|
138820f1bd
|
gst in surcharge config
|
7 years ago |
|
wangning
|
58f40e8248
|
device offline
|
7 years ago |
|
wangning
|
e363faba95
|
Merge branch 'master' of https://git.royalpay.com.au/git/royalv2.manage
|
7 years ago |
|
wangning
|
464fc1b474
|
update
|
7 years ago |
|
eason.qian
|
106ca85bfb
|
fix
|
7 years ago |
|
eason.qian
|
636ab2cf01
|
fix
|
7 years ago |
|
eason.qian
|
9b7c6ab014
|
fix
|
7 years ago |
|
wangning
|
e8478bb641
|
update
|
7 years ago |
|
eason.qian
|
4d2e010ed7
|
fix
|
7 years ago |
|
wangning
|
4eb69c41a0
|
update
|
7 years ago |
|
wangning
|
1fb82e3521
|
settlement add Tax amount
|
7 years ago |
|
wangning
|
2a9bf2e1db
|
Merge branch 'develop' of https://git.royalpay.com.au/git/royalv2.manage into develop
|
7 years ago |
|
wangning
|
d5acfc2bbd
|
remove unnecessary code
|
7 years ago |
|
eason.qian
|
b0ca17b063
|
orderDetail add tax_amount
|
7 years ago |
|
wangning
|
950fdc67e4
|
update
|
7 years ago |
|
wangning
|
df89d30232
|
update
|
7 years ago |
|
wangning
|
56335ed7f8
|
Merge branch 'master' of https://git.royalpay.com.au/git/royalv2.manage
|
7 years ago |
|
wangning
|
7c0b958fee
|
bill Order Check Task
|
7 years ago |
|
Tayl0r
|
ee3e2605a3
|
Merge remote-tracking branch 'origin/develop' into develop
|
7 years ago |
|
Tayl0r
|
0e864e89a9
|
fix
|
7 years ago |
|
yuan
|
33e3ef225f
|
fix~
|
7 years ago |
|
Tayl0r
|
7a714d4862
|
fix
|
7 years ago |
|
eason.qian
|
d0b08c60fe
|
Merge remote-tracking branch 'origin/develop' into develop
|
7 years ago |
|
eason.qian
|
f1dcefc6ed
|
fix bd String
|
7 years ago |
|
Tayl0r
|
7f0c42f3b9
|
[Y] 支付宝线上清算预估
|
7 years ago |
|
Tayl0r
|
000ba24c1b
|
Merge remote-tracking branch 'origin/develop' into develop
|
7 years ago |
|
yixian
|
1c538488b9
|
retail query daily transactions can choose dev only transactions
|
7 years ago |
|
wangning
|
82707c9d85
|
update
|
7 years ago |
|
eason.qian
|
ef2e90efbe
|
fix bd String
|
7 years ago |
|
eason.qian
|
f385c488a0
|
fix bd String
|
7 years ago |
|
Tayl0r
|
354b6b6595
|
Merge remote-tracking branch 'origin/develop' into develop
|
7 years ago |
|
eason.qian
|
dcd9c55f52
|
fix manager_id String
|
7 years ago |
|
eason.qian
|
68b42a4f85
|
fix bd_id String
|
7 years ago |
|
eason.qian
|
d1ec5620d5
|
fix
|
7 years ago |
|
Tayl0r
|
3d86ba8a9b
|
[Y] 修复清算预估
|
7 years ago |
|
eason.qian
|
6e9c1bbc4c
|
fix
|
7 years ago |
|
eason.qian
|
16282c0cab
|
Merge remote-tracking branch 'origin/transaction-up'
|
7 years ago |
|
macminiuser
|
e160be4afd
|
fix
|
7 years ago |
|
wangning
|
90baf73d49
|
update
|
7 years ago |
|
wangning
|
5148f6c15a
|
update
|
7 years ago |
|
wangning
|
c80e8689b0
|
Merge branch 'develop'
|
7 years ago |
|
wangning
|
f67edfcaf2
|
update
|
7 years ago |
|
wangning
|
308eca2a06
|
Merge branch 'develop_bill' into develop
|
7 years ago |
|
Tayl0r
|
599864897f
|
Merge branch 'develop'
|
7 years ago |
|
Tayl0r
|
dc0c2d9275
|
[Y] 修复支付模板页
|
7 years ago |
|
wangning
|
52802a008a
|
update
|
7 years ago |
|
yuan
|
abce303d14
|
dashboard增加获取支付限额接口
|
7 years ago |
|
wangning
|
4684a955a0
|
Merge branch 'hotfix_asd'
|
7 years ago |
|
wangning
|
56290c7bdb
|
Merge branch 'hotfix_asd' into develop
|
7 years ago |
|
wangning
|
ab111ce878
|
update
|
7 years ago |
|
wangning
|
8f0ed0f051
|
update
|
7 years ago |
|
eason.qian
|
54e8c5bb6e
|
Merge branch 'develop'
|
7 years ago |
|
yuan
|
8e5e533678
|
账号修改，隐藏组织
|
7 years ago |
|
yuan
|
86b9770257
|
fix~
|
7 years ago |
|
yuan
|
fea62f737f
|
fix 账号组织bug，过滤manangerList
|
7 years ago |
|
wangning
|
d2ed6455d1
|
update
|
7 years ago |
|
yuan
|
f9a76696f5
|
Merge remote-tracking branch 'origin/develop' into develop
|
7 years ago |
|
Tayl0r
|
e7c5ed66c4
|
Merge branch 'master' of https://git.royalpay.com.au/git/royalv2.manage
|
7 years ago |
|
Tayl0r
|
6af568cff4
|
Merge branch 'develop'
|
7 years ago |
|
Tayl0r
|
f9d4a39cf1
|
[Y] 指定退款审核人
|
7 years ago |
|
yuan
|
f4cb0221fe
|
修改交易额
|
7 years ago |
|
yuan
|
e968c49c2b
|
fix 账号组织bug
|
7 years ago |
yixian
|
c71e629188
|
gst support
|
7 years ago |
|
yuan
|
bf9a4f81e0
|
二级组织费率限制
|
7 years ago |
|
wangning
|
db26a8bc29
|
update
|
7 years ago |
|
eason.qian
|
b169e046b4
|
Merge branch 'develop'
|
7 years ago |
|
eason.qian
|
c228696136
|
fix~
|
7 years ago |
|
wangning
|
bf69dfbfe5
|
add cancle time
|
7 years ago |
|
wangning
|
7728c15c81
|
update
|
7 years ago |
|
wangning
|
85e9c392f9
|
update
|
7 years ago |
|
wangning
|
b476f2f898
|
update
|
7 years ago |
|
macminiuser
|
8bacdb61ea
|
交易额+退款+退款+退款笔数+App流水接口、交易额相关接口调整
|
7 years ago |
|
wangning
|
b89f0072c4
|
update
|
7 years ago |
|
eason.qian
|
e53f2eab57
|
Merge branch 'develop'
|
7 years ago |
|
eason.qian
|
d3c0f138c4
|
开放Cashier的settlement log下载权限
|
7 years ago |
|
yuan
|
d4a251a395
|
增加二级组织费率限制
|
7 years ago |
|
Tayl0r
|
ce38db718d
|
ignore
|
7 years ago |
|
wangning
|
4eaddd9cf1
|
update
|
7 years ago |
|
Tayl0r
|
0600b30702
|
Merge branch 'develop'
|
7 years ago |
|
Tayl0r
|
87584077f9
|
[Y] surcharge为实时计算
|
7 years ago |
|
Tayl0r
|
81fa3ef96c
|
Revert "ignore"
This reverts commit ae589d5
|
7 years ago |
|
Tayl0r
|
25416d5478
|
Merge branch 'develop'
|
7 years ago |
|
Tayl0r
|
ae589d563a
|
ignore
|
7 years ago |
|
Tayl0r
|
eb5fdb48df
|
[Y] 新增AlipayOnline对账查询
|
7 years ago |
|
yuan
|
9b9a477f78
|
商户管理增加bd分组筛选
|
7 years ago |
|
wangning
|
db4e04451e
|
bill
|
7 years ago |
|
eason.qian
|
f3ddd64c23
|
Merge branch 'develop'
|
7 years ago |
|
eason.qian
|
f40a9b5721
|
fix exchange rate
|
7 years ago |
|
eason.qian
|
945a5bee96
|
Merge branch 'develop'
|
7 years ago |
|
eason.qian
|
cb9084e768
|
fix exchange rate
|
7 years ago |
|
eason.qian
|
a9fdea18c2
|
Merge branch 'develop'
|
7 years ago |
|
eason.qian
|
cff32aa65d
|
fix exchange rate
|
7 years ago |
|
eason.qian
|
16095a9122
|
fix
|
7 years ago |
|
yuan
|
d21d2210c6
|
修改一级组织显示，账号管理增加二级组织筛选
|
7 years ago |
|
wangning
|
efd5d8d14d
|
bill init
|
7 years ago |
|
yixian
|
7cd41b90ee
|
tradelog page
|
7 years ago |
|
yuan
|
7982c078cd
|
fix~
|
7 years ago |
|
yuan
|
8de1d7b688
|
修改页面年份显示
|
7 years ago |
|
wangning
|
2ecb3920e2
|
Merge branch 'updat' into develop
|
7 years ago |
|
wangning
|
d5165e50aa
|
fixbug BD leader Commissions
|
7 years ago |
|
yuan
|
345c48ca8c
|
修改‘合伙人提成’与‘BD提成’页面年份显示
|
7 years ago |
|
eason.qian
|
599481c31a
|
Merge remote-tracking branch 'origin/develop' into develop
|
7 years ago |
|
eason.qian
|
e1dea2cbbc
|
fix
|
7 years ago |
|
yuan
|
ed380d8f9f
|
fix~
|
7 years ago |
|
wangning
|
21e77daeba
|
Merge branch 'update' into develop
|
7 years ago |
|
wangning
|
92220fb273
|
cache exchange_rates
|
7 years ago |
|
wangning
|
aaad7455bc
|
Merge branch 'updat' into develop
|
7 years ago |
|
wangning
|
c3d5ffa457
|
update
|
7 years ago |
|
yixian
|
1d95427e60
|
Merge remote-tracking branch 'origin/master'
|
7 years ago |
|
yixian
|
86aa70508c
|
Merge remote-tracking branch 'origin/develop' into develop
|
7 years ago |
|
yixian
|
3407a0f9cf
|
Merge branch 'hotfix20180131invoice' into develop
|
7 years ago |
|
yixian
|
75e6778591
|
Merge branch 'hotfix20180131invoice'
|
7 years ago |
|
yixian
|
afb9586017
|
asynchronize redirect after payment
|
7 years ago |
|
wangning
|
c894a782db
|
Merge branch 'update' into develop
|
7 years ago |
|
yixian
|
447e8bd7ef
|
invoice with gst
|
7 years ago |
|
wangning
|
6f390ad15e
|
update
|
7 years ago |
|
yixian
|
cf7d094665
|
Merge branch 'hotfix20180131invoice' into develop
|
7 years ago |
|
yixian
|
768b666977
|
Merge branch 'hotfix20180131invoice'
|
7 years ago |
|
yixian
|
2502a96da6
|
invoice
|
7 years ago |
|
wangning
|
2e95ddec2e
|
Merge branch 'fixbug' into develop
|
7 years ago |
“sunn”
|
e134c27257
|
[Y] 商户编码添加默认值（6位数字字母组合）且不可修改
|
7 years ago |
|
yixian
|
0d7b31696b
|
invoice
|
7 years ago |
|
wangning
|
c63da8fed1
|
fixbug
|
7 years ago |
|
yixian
|
1d7146e6bf
|
Merge remote-tracking branch 'origin/develop' into develop
|
7 years ago |
|
yixian
|
d98624f2ce
|
invoice
|
7 years ago |
|
wangning
|
912c71f167
|
Merge branch 'develop' of https://git.royalpay.com.au/git/royalv2.manage into develop
|
7 years ago |
|
wangning
|
c24f0a6cca
|
Merge branch 'updateOfei' into develop
|
7 years ago |
|
wangning
|
4550ed0958
|
update
|
7 years ago |
|
yuan
|
d78aea4331
|
fix~
|
7 years ago |
|
wangning
|
522857d479
|
Merge branch 'develop' of https://git.royalpay.com.au/git/royalv2.manage into develop
|
7 years ago |
|
wangning
|
e322e6a631
|
Merge branch 'ofeiQB' into develop
|
7 years ago |
|
wangning
|
bf9f170a31
|
update
|
7 years ago |
|
yuan
|
521002a8b6
|
增加后台微信商户进件
|
7 years ago |
|
wangning
|
22d9738920
|
QB top up
|
7 years ago |
|
yuan
|
64d17e4027
|
Merge branch 'branch_v1' into develop
|
7 years ago |
|
yuan
|
86d07c5f69
|
fix~
|
7 years ago |
|
wangning
|
45b3149865
|
Merge branch 'changePWD' into develop
|
7 years ago |
|
wangning
|
5168d717f8
|
fixbug change pwd
|
7 years ago |
|
eason.qian
|
1bdcf5fa52
|
fix
|
7 years ago |
|
eason.qian
|
262ce70a7d
|
fix
|
7 years ago |
|
yuan
|
9cdc0012b1
|
fix~
|
7 years ago |
|
yuan
|
59683281f2
|
fix~
|
7 years ago |
|
yuan
|
314b56cfbf
|
Merge branch 'brancah' into develop
|
7 years ago |
|
yuan
|
7d4eb6333d
|
fix~
|
7 years ago |
|
yuan
|
511faafdda
|
fix~
|
7 years ago |
|
wangning
|
57b2dba12b
|
fixbug
|
7 years ago |
|
wangning
|
25eb4cc11b
|
fixbug
|
7 years ago |
|
wangning
|
ed75226b06
|
fixbug
|
7 years ago |
|
wangning
|
3c9e1bedcc
|
Merge branch 'master' of https://git.royalpay.com.au/git/royalv2.manage
|
7 years ago |
|
wangning
|
95e2330926
|
fixbug weekReport
|
7 years ago |
|
yuan
|
7b563647f4
|
fix~
|
7 years ago |
|
wangning
|
6d727a4b7a
|
update
|
7 years ago |
|
eason.qian
|
d93951a95c
|
fix
|
7 years ago |
|
eason.qian
|
5f262bb891
|
fix
|
7 years ago |
|
wangning
|
da9edeb525
|
Merge branch 'develop' of https://git.royalpay.com.au/git/royalv2.manage into develop
|
7 years ago |
|
wangning
|
6512c4d249
|
Merge branch 'update1' into develop
# Conflicts:
# src/db/modify.sql
# src/main/ui/static/analysis/org/templates/analysis_org.html
|
7 years ago |
|
wangning
|
12640d5d67
|
update
|
7 years ago |
|
yuan
|
653ee2c04f
|
fix~
|
7 years ago |
|
wangning
|
adac252b26
|
Merge branch 'master' of https://git.royalpay.com.au/git/royalv2.manage
|
7 years ago |
|
wangning
|
2bea260aa0
|
Merge branch 'update' into develop
# Conflicts:
# src/db/modify.sql
|
7 years ago |
|
wangning
|
b153a3add8
|
update
|
7 years ago |
|
eason.qian
|
be08073c17
|
Merge branch 'develop'
|
7 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
|
7 years ago |
|
wangning
|
a2ff3bb338
|
Merge branch 'develop' of https://git.royalpay.com.au/git/royalv2.manage into develop
|
7 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
|
7 years ago |
|
wangning
|
48184d9b60
|
Merge branch 'CustomerImpression' into develop
|
7 years ago |
|
wangning
|
7e050369ee
|
Merge branch 'mergeReferrer&CityPartner'
# Conflicts:
# src/db/modify.sql
|
7 years ago |
|
wangning
|
615064d1b9
|
Merge branch 'CustomerImpression'
|
7 years ago |
|
eason.qian
|
e1f42e1569
|
Merge remote-tracking branch 'origin/master'
|
7 years ago |
|
eason.qian
|
4dd5b278a5
|
fix
|
7 years ago |
|
wangning
|
9ddcea613f
|
update
|
7 years ago |
|
yuan
|
1d80f8fcc7
|
fix~
|
7 years ago |
|
wangning
|
58aba0f91b
|
update
|
7 years ago |
|
yuan
|
846bc84c0a
|
Merge remote-tracking branch 'origin/develop' into develop
|
7 years ago |
|
yuan
|
9b6c378506
|
fix~
|
7 years ago |
|
wangning
|
28537f5783
|
tmp
|
7 years ago |
|
yuan
|
3b2718e6fe
|
fix~
|
7 years ago |
|
wangning
|
4dd5684974
|
Merge branch 'master' of https://git.royalpay.com.au/git/royalv2.manage
|
7 years ago |
|
wangning
|
cd205dc5b5
|
Merge branch 'develop' of https://git.royalpay.com.au/git/royalv2.manage into develop
|
7 years ago |
|
eason.qian
|
87473b6671
|
Merge branch 'develop'
|
7 years ago |
|
wangning
|
ce7e6ccf82
|
Merge branch 'fixBugAppVersion' into develop
|
7 years ago |
|
eason.qian
|
8d7548f8d6
|
fix
|
7 years ago |
|
wangning
|
b257a7dfde
|
update
|
7 years ago |
|
wangning
|
9c567a6e98
|
update
|
7 years ago |
|
wangning
|
9d9b5d2527
|
customer impression
|
7 years ago |
|
eason.qian
|
613bfd0c30
|
fix
|
7 years ago |
|
yixian
|
b8b5ea5a63
|
Merge remote-tracking branch 'origin/master'
|
7 years ago |
|
yixian
|
d679cfc334
|
gateway jsapi update
|
7 years ago |
|
yixian
|
6e626b4e2e
|
Merge remote-tracking branch 'origin/develop' into develop
|
7 years ago |
|
yixian
|
c60fed5d29
|
gateway jsapi update
|
7 years ago |
|
yuan
|
5e5882a857
|
fix~
|
7 years ago |
|
yuan
|
57ebbea75b
|
Merge remote-tracking branch 'origin/develop' into develop
|
7 years ago |
|
yuan
|
cbcffe9a97
|
交易流水，合伙人，监控，增加组织筛选
|
7 years ago |
|
eason.qian
|
7bb7d7803e
|
fix
|
7 years ago |
|
wangning
|
6f17abf3b3
|
Merge branch 'appNotice' into develop
|
7 years ago |
|
wangning
|
fecd1beb28
|
remove notice message "status"
|
7 years ago |
|
wangning
|
e734b44f9a
|
finish merge referrer & cityPartner
|
7 years ago |
|
wangning
|
902ee0aa3f
|
tmp
|
7 years ago |
|
wangning
|
9d72ee8451
|
tmp
|
7 years ago |
|
wangning
|
7db3c20519
|
Merge branch 'weekReport' into develop
# Conflicts:
# src/db/modify.sql
|
7 years ago |
|
wangning
|
efb70cf03e
|
fixbug week report thymeleaf
|
7 years ago |
|
wangning
|
9d213a018c
|
合并冲突
|
7 years ago |
|
wangning
|
c1dff4cb09
|
Merge branch 'andriodReleaseNote' into develop
# Conflicts:
# src/db/modify.sql
|
7 years ago |
|
wangning
|
c95568e565
|
tmp
|
7 years ago |
|
wangning
|
3f9ef5d8b1
|
Merge branch 'andriodReleaseNote' into mergeReferrer&CityPartner
# Conflicts:
# src/db/modify.sql
|
7 years ago |
|
wangning
|
f88ada4a20
|
andriod Release note
|
7 years ago |
|
wangning
|
5561497b31
|
Merge branch 'master' of https://git.royalpay.com.au/git/royalv2.manage
|
7 years ago |
|
wangning
|
24b76d3fd5
|
Merge branch 'develop' of https://git.royalpay.com.au/git/royalv2.manage into develop
|
7 years ago |
|
wangning
|
1316ee44fb
|
Merge branch 'companyAddress' into develop
|
7 years ago |
|
wangning
|
e7fe4cceab
|
modify address
|
7 years ago |
|
wangning
|
6cd45c9ac2
|
tmp
|
7 years ago |
|
yixian
|
7a5cd92b27
|
remove duplicate
|
7 years ago |
|
yixian
|
785c182691
|
Merge branch 'hotfix20180115_cashbackdelaysettle' into develop
|
7 years ago |
|
yixian
|
9feb531c12
|
Merge remote-tracking branch 'origin/master'
|
7 years ago |
|
yixian
|
708dbfcd44
|
settle delay cashback
|
7 years ago |
|
yixian
|
4901bd8b1c
|
settle delay cashback
|
7 years ago |
|
wangning
|
9730e6be3d
|
Merge branch 'develop' of https://git.royalpay.com.au/git/royalv2.manage into develop
|
7 years ago |
|
wangning
|
f14b7c10b9
|
Merge branch 'partnerCommission' into develop
|
7 years ago |
|
wangning
|
ce65ae462a
|
update
|
7 years ago |
|
wangning
|
3032d6315b
|
update
|
7 years ago |
|
wangning
|
9f8157372f
|
update
|
7 years ago |
|
yuan
|
5038be689d
|
fix~
|
7 years ago |
|
wangning
|
2eea4ed50c
|
calculat type
|
7 years ago |
|
yuan
|
41ec087b72
|
增加合伙人提成方式筛选，增加商户最低费率检测
|
7 years ago |
|
wangning
|
7a5a6276ac
|
update
|
7 years ago |
|
wangning
|
ea18e38234
|
tmp
|
7 years ago |
|
wangning
|
b4fa4057b5
|
update
|
7 years ago |
|
wangning
|
cbe7a26bc6
|
Merge branch 'customerImpression' into develop
|
7 years ago |
|
wangning
|
a5ca5655a0
|
update
|
7 years ago |
|
wangning
|
74eca570af
|
Merge branch 'agent' into develop
|
7 years ago |
|
wangning
|
e245a6b44a
|
update sql
|
7 years ago |
|
wangning
|
d5e895213f
|
Merge branch 'master' of https://git.royalpay.com.au/git/royalv2.manage
|
7 years ago |
|
wangning
|
c92c11a4d1
|
update
|
7 years ago |
|
wangning
|
cfb67ac4de
|
agent commission finish
|
7 years ago |
|
eason.qian
|
ea7e9506f1
|
Merge remote-tracking branch 'origin/master'
|
7 years ago |
|
eason.qian
|
8e662e7939
|
fix
|
7 years ago |
|
wangning
|
52140edce6
|
update
|
7 years ago |
|
yixian
|
0681a81bb4
|
sysParams
|
7 years ago |
|
yixian
|
a80d35fb93
|
Merge remote-tracking branch 'origin/master'
|
7 years ago |
|
yixian
|
490b266792
|
sysconfig
|
7 years ago |
|
wangning
|
3bbdd7968a
|
tmp
|
7 years ago |
|
eason.qian
|
edcca09eba
|
fix
|
7 years ago |
|
eason.qian
|
430dbda056
|
fix
|
7 years ago |
|
wangning
|
690c25e399
|
update
|
7 years ago |
|
wangning
|
c4e0b4052f
|
Customer impression task
|
7 years ago |
|
wangning
|
a02314e294
|
Customer impression task
|
7 years ago |
|
wangning
|
b46745ed55
|
tmp
|
7 years ago |
|
Tayl0r
|
e5c48fad29
|
fix
|
7 years ago |
|
yuan
|
02e3d58be7
|
fix~
|
7 years ago |
|
eason.qian
|
63f6832d5e
|
fix
|
7 years ago |
|
eason.qian
|
575f0b7725
|
fix
|
7 years ago |
|
wangning
|
a9577f0033
|
Merge branch 'develop' of https://git.royalpay.com.au/git/royalv2.manage into develop
|
7 years ago |
|
wangning
|
974d1e09ea
|
Customer impression task
|
7 years ago |
|
wangning
|
fb1f4f95b2
|
update
|
7 years ago |
|
yuan
|
72244fef3b
|
fix~
|
7 years ago |
|
eason.qian
|
2a48f5a6aa
|
fix
|
7 years ago |
|
eason.qian
|
e064d30a64
|
fix
|
7 years ago |
|
eason.qian
|
8eca73d1a0
|
Merge remote-tracking branch 'origin/master'
|
7 years ago |
|
eason.qian
|
50321ef85c
|
fix
|
7 years ago |
|
wangning
|
d93445eec2
|
tmp
|
7 years ago |
|
wangning
|
743662719f
|
update message
|
7 years ago |
|
eason.qian
|
a206d3a8c5
|
fix
|
7 years ago |
|
eason.qian
|
ea19cd8c9b
|
Merge remote-tracking branch 'origin/develop' into develop
|
7 years ago |
|
eason.qian
|
8850543d30
|
fix
|
7 years ago |
|
wangning
|
ec85f30c98
|
update log
|
7 years ago |
|
wangning
|
f99cacdf7f
|
update
|
7 years ago |
|
wangning
|
eefec84fc7
|
Merge branch 'develop' of https://git.royalpay.com.au/git/royalv2.manage into develop
|
7 years ago |
|
wangning
|
ef828b55e5
|
jpush app key
|
7 years ago |
|
wangning
|
c84bb59102
|
Merge branch 'Jpush' into develop
|
7 years ago |
|
wangning
|
9df05a5ee1
|
update
|
7 years ago |
|
eason.qian
|
fc63e8428b
|
fix
|
7 years ago |
|
yuan
|
bf1770d552
|
fix~
|
7 years ago |
|
yuan
|
c964f93649
|
fix~
|
7 years ago |
|
wangning
|
113d2bcc84
|
update
|
7 years ago |
|
wangning
|
d28313c06a
|
agentCommission
|
7 years ago |
|
eason.qian
|
49609d0f2c
|
fix
|
7 years ago |
|
yuan
|
2b377006cb
|
Merge remote-tracking branch 'origin/develop' into develop
|
7 years ago |
|
eason.qian
|
a9e1d653aa
|
fix
|
7 years ago |
|
yuan
|
c53ea04d2e
|
fix~
|
7 years ago |
|
eason.qian
|
f1f1a62e31
|
fix add orgmanager Role
|
7 years ago |
|
eason.qian
|
9abd9b36ed
|
Merge remote-tracking branch 'origin/develop' into develop
|
7 years ago |
|
eason.qian
|
322c4ea227
|
fix
|
7 years ago |
|
yixian
|
9a40d2b726
|
Merge remote-tracking branch 'origin/develop' into develop
|
7 years ago |
|
yixian
|
796a600812
|
Merge branch 'hotfix02180109compile_err' into develop
|
7 years ago |
|
yixian
|
30485cde91
|
config
|
7 years ago |
|
yixian
|
532a122a28
|
compileError
|
7 years ago |
|
eason.qian
|
bace0e420e
|
fix
|
7 years ago |
|
wangning
|
f55329661c
|
tmp
|
7 years ago |
|
wangning
|
ae5a21fc3c
|
update
|
7 years ago |
|
yuan
|
0cbefe6558
|
fix~
|
7 years ago |
|
yuan
|
c10502580f
|
fix~
|
7 years ago |
|
wangning
|
0563d91d68
|
update android msg
|
7 years ago |
|
yuan
|
d8041ca3ce
|
fix~
|
7 years ago |
|
wangning
|
fe9815aba6
|
Merge branch 'develop' of https://git.royalpay.com.au/git/royalv2.manage into develop
|
7 years ago |
|
wangning
|
5597444015
|
update
|
7 years ago |
|
yuan
|
66775e24c2
|
组织管理增加二级筛选，用户管理，交易流水，增加二级代理筛选
|
7 years ago |
|
wangning
|
3e5c785433
|
Merge branch 'costomerImpression' into develop
|
7 years ago |
|
wangning
|
3738ebb1c4
|
customer impression
|
7 years ago |
|
wangning
|
f41e4c2ab7
|
update
|
7 years ago |
|
wangning
|
4eec126f95
|
test
|
7 years ago |
|
eason.qian
|
2519717c54
|
Merge remote-tracking branch 'origin/develop' into develop
|
7 years ago |
|
eason.qian
|
4644f30cad
|
fix
|
7 years ago |
|
wangning
|
9b8b9639c0
|
update
|
7 years ago |
|
wangning
|
c3b20d0aff
|
Merge branch 'develop' of https://git.royalpay.com.au/git/royalv2.manage into develop
|
7 years ago |
|
wangning
|
993fe26a1e
|
Merge branch 'master' of https://git.royalpay.com.au/git/royalv2.manage
|
7 years ago |
|
wangning
|
2323459f31
|
finish refactor the message
|
7 years ago |
|
wangning
|
39966a1cee
|
Merge branch 'update' into develop
|
7 years ago |
|
wangning
|
653b66f8f5
|
update
|
7 years ago |
|
wangning
|
835246c24a
|
tmp
|
7 years ago |
|
wangning
|
25cb91d372
|
Merge branch 'update2' into develop
|
7 years ago |
|
wangning
|
20fcdb89cb
|
update
|
7 years ago |
|
wangning
|
0327de0101
|
tmp
|
7 years ago |
|
eason.qian
|
d988b7fa3d
|
Merge branch 'master' into develop
|
7 years ago |
|
wangning
|
db15bacef1
|
Merge branch 'update' into develop
|
7 years ago |
|
wangning
|
3fe7db9421
|
update
|
7 years ago |
|
wangning
|
2550cef8db
|
Merge branch 'update' into develop
|
7 years ago |
|
wangning
|
916c7fce3f
|
update
|
7 years ago |
|
eason.qian
|
d9f715bb92
|
Merge remote-tracking branch 'origin/master'
|
7 years ago |
|
eason.qian
|
3526367848
|
fix
|
7 years ago |
|
wangning
|
e4c8f7de62
|
update
|
7 years ago |
|
wangning
|
5802cd65a2
|
Merge branch 'udpate' into develop
|
7 years ago |
|
wangning
|
ea8a6fa275
|
update
|
7 years ago |
|
yuan
|
af0c5a8cae
|
Merge remote-tracking branch 'origin/develop' into develop
|
7 years ago |
|
yuan
|
b7abc5b78f
|
商户详情里增加Local Merchant按钮
|
7 years ago |
|
wangning
|
0d280f93ac
|
Merge branch 'master' of https://git.royalpay.com.au/git/royalv2.manage
|
7 years ago |
|
wangning
|
c01d34332c
|
Merge branch 'develop' of https://git.royalpay.com.au/git/royalv2.manage into develop
|
7 years ago |
|
wangning
|
bc45d5389d
|
Merge branch 'update' into develop
|
7 years ago |
|
wangning
|
df2d13826f
|
update
|
7 years ago |
|
yixian
|
17039a0e8b
|
Merge branch 'hotfix20180104customerpoints' into develop
|
7 years ago |
|
yixian
|
fec1decc5f
|
Merge remote-tracking branch 'origin/master'
|
7 years ago |
|
yixian
|
fba967152d
|
points
|
7 years ago |
|
wangning
|
bc5a7485ba
|
Merge branch 'update' into develop
|
7 years ago |
|
wangning
|
3f9d65aa58
|
update
|
7 years ago |
|
wangning
|
426638a76c
|
Merge branch 'master' of https://git.royalpay.com.au/git/royalv2.manage
|
7 years ago |
|
wangning
|
e20e85fa17
|
Merge branch 'develop' of https://git.royalpay.com.au/git/royalv2.manage into develop
|
7 years ago |
|
wangning
|
4027c84deb
|
update
|
7 years ago |
|
yuan
|
21502cf568
|
Merge remote-tracking branch 'origin/develop' into develop
|
7 years ago |
|
yuan
|
633a128c81
|
fix~
|
7 years ago |
|
eason.qian
|
b237c9072c
|
fix newCustomers
|
7 years ago |
|
wangning
|
de7a193402
|
Jpush
|
7 years ago |
|
wangning
|
06b857eb51
|
update
|
7 years ago |
|
wangning
|
7372c93190
|
phone top up list
|
7 years ago |
|
wangning
|
5160d9f9cb
|
Merge branch 'master' of https://git.royalpay.com.au/git/royalv2.manage
|
7 years ago |
|
wangning
|
deb4732397
|
Merge branch 'develop' of https://git.royalpay.com.au/git/royalv2.manage into develop
|
7 years ago |
|
wangning
|
1aa6f6680f
|
fixbug
|
7 years ago |
|
yixian
|
bc4122226b
|
settle warnings
|
7 years ago |
|
wangning
|
11c524729d
|
update
|
7 years ago |
|
wangning
|
a7519cf5ee
|
Merge branch 'develop' of https://git.royalpay.com.au/git/royalv2.manage into develop
|
7 years ago |
|
wangning
|
1a81591c93
|
modify ofei error message
|
7 years ago |
|
yixian
|
f06eb372dd
|
Merge branch 'hotfix20180102settlereportyearselect' into develop
|
7 years ago |
|
yixian
|
633c3420c7
|
year select
|
7 years ago |
|
yixian
|
13e8a44b80
|
Merge branch 'hotfix20180102settlereportyearselect' into develop
|
7 years ago |
|
yixian
|
116d1d74c4
|
settle report year select
|
7 years ago |
|
yuan
|
42eb1ed609
|
修改登录页与过渡页图标
|
7 years ago |
|
eason.qian
|
50243843df
|
fix
|
7 years ago |
|
wangning
|
8ba499ce78
|
Merge branch 'develop' of https://git.royalpay.com.au/git/royalv2.manage into develop
|
7 years ago |
|
wangning
|
7b0f5dc2ca
|
rename
|
7 years ago |
|
Tayl0r
|
e629c97005
|
修改合规文件移动端显示
|
7 years ago |
|
yixian
|
8b15199265
|
list daily transactions bug
|
7 years ago |
|
yixian
|
d603b882a7
|
paynotice
|
7 years ago |
|
eason.qian
|
0821e3ff32
|
fix
|
7 years ago |
|
eason.qian
|
735f8b7673
|
fix
|
7 years ago |
|
eason.qian
|
ea1e789045
|
Merge remote-tracking branch 'origin/master'
|
7 years ago |
|
eason.qian
|
d55919af7d
|
fix
|
7 years ago |
|
yixian
|
f1a2780a28
|
env,lang3
|
7 years ago |
|
wangning
|
cf275293ea
|
fixbug
|
7 years ago |
|
wangning
|
569af3aea0
|
Merge branch 'develop'
|
7 years ago |
|
wangning
|
ed9c867027
|
Merge branch 'master' into develop
|
7 years ago |
|
wangning
|
69e4220698
|
phone top up Test demo
|
7 years ago |
|
eason.qian
|
1dceaae57b
|
fix
|
7 years ago |
|
eason.qian
|
8827728559
|
fix
|
7 years ago |
|
wangning
|
9ea8134c24
|
Merge branch 'master' of https://git.royalpay.com.au/git/royalv2.manage
|
7 years ago |
|
wangning
|
89c10f9cc6
|
Merge branch 'hotfix' into develop
|
7 years ago |
|
wangning
|
83d29cc881
|
fixbug
|
7 years ago |
|
yixian
|
359f357f2c
|
Merge remote-tracking branch 'origin/master'
|
7 years ago |
|
yixian
|
381114e974
|
order expiry setter
|
7 years ago |
|
wangning
|
ed14f21cb1
|
update
|
7 years ago |
|
wangning
|
47c7b67eb7
|
add ofei
|
7 years ago |
|
wangning
|
c6344877ad
|
update
|
7 years ago |
|
wangning
|
1b48cd65f3
|
Customer impression
|
7 years ago |
|
eason.qian
|
08d0fcb4c2
|
fix
|
7 years ago |
|
yuan
|
c9234149f1
|
Merge remote-tracking branch 'origin/master'
|
7 years ago |
|
yuan
|
6253447003
|
增加customer调用接口，获取manager列表
|
7 years ago |
|
eason.qian
|
95dff547d2
|
fix
|
7 years ago |
|
eason.qian
|
c983035613
|
fix
|
7 years ago |
|
yuan
|
573ae86bff
|
fix~
|
7 years ago |
|
wangning
|
4ceef6abb1
|
Merge branch 'master' of https://git.royalpay.com.au/git/royalv2.manage
|
7 years ago |
|
wangning
|
f26a747c05
|
add new sub partner excepeion
|
7 years ago |
|
eason.qian
|
bbede6fa04
|
Merge remote-tracking branch 'origin/master'
|
7 years ago |
|
eason.qian
|
2596573b83
|
fix
|
7 years ago |
|
wangning
|
0b7f69d450
|
Merge branch 'master' of https://git.royalpay.com.au/git/royalv2.manage
|
7 years ago |
|
wangning
|
9647e0e1f4
|
模板页
|
7 years ago |
|
Tayl0r
|
8b078e28a7
|
fix bugs
|
7 years ago |
|
wangning
|
bfbb4d37d9
|
Merge branch 'master' of https://git.royalpay.com.au/git/royalv2.manage
|
7 years ago |
|
eason.qian
|
d3f65edccf
|
fix commons
|
7 years ago |
|
wangning
|
cdadaaa427
|
fixbug
|
7 years ago |
|
wangning
|
02e482c871
|
删除多余代码
|
7 years ago |
|
wangning
|
86984942bf
|
Merge branch 'master' of https://git.royalpay.com.au/git/royalv2.manage
|
7 years ago |
|
wangning
|
cf8289a44a
|
mail
|
7 years ago |
|
Tayl0r
|
bfaee6b248
|
remove scroll
|
7 years ago |
|
wangning
|
e4a4004167
|
transaction
|
7 years ago |
|
wangning
|
9304866561
|
update
|
7 years ago |
|
wangning
|
201285beac
|
update
|
7 years ago |
|
wangning
|
4b91c5e0db
|
Merge branch 'master' of https://git.royalpay.com.au/git/royalv2.manage
|
7 years ago |
|
wangning
|
33c9d6eb24
|
update
|
7 years ago |
|
eason.qian
|
1cfd7a5e8c
|
Merge remote-tracking branch 'origin/master'
|
7 years ago |
|
eason.qian
|
cb7f575100
|
fix
|
7 years ago |
|
wangning
|
af5b164596
|
update
|
7 years ago |
|
wangning
|
516cb26e46
|
update
|
7 years ago |
|
wangning
|
4406299113
|
update
|
7 years ago |
|
wangning
|
31294a4ed6
|
Merge branch 'master' of https://git.royalpay.com.au/git/royalv2.manage
|
7 years ago |
|
wangning
|
a1b1e91d43
|
update
|
7 years ago |
|
eason.qian
|
df6cbe24ca
|
Merge remote-tracking branch 'origin/master'
|
7 years ago |
|
eason.qian
|
ceaf48fd45
|
fix
|
7 years ago |
|
wangning
|
a1967376e1
|
update
|
7 years ago |
|
wangning
|
dc50fa5ff8
|
update
|
7 years ago |
|
wangning
|
90c3ca6633
|
update
|
7 years ago |
|
wangning
|
c0e8900f76
|
update
|
7 years ago |
|
wangning
|
619ba827bf
|
update
|
7 years ago |
|
wangning
|
d5c18b68b5
|
update
|
7 years ago |
|
wangning
|
a5f4d1fad5
|
update
|
7 years ago |
|
wangning
|
4aa5ebc920
|
Merge branch 'master' of https://git.royalpay.com.au/git/royalv2.manage
|
7 years ago |
|
wangning
|
a8a7553b4b
|
modify css
|
7 years ago |
|
Tayl0r
|
c4353dbae1
|
remove forbidden scroll
|
7 years ago |
|
wangning
|
4ab416e7fe
|
Merge branch 'master' of https://git.royalpay.com.au/git/royalv2.manage
|
7 years ago |
|
wangning
|
27870bea33
|
update
|
7 years ago |
|
Tayl0r
|
a56e692e76
|
ignore
|
7 years ago |
|
wangning
|
39af9bac34
|
update
|
7 years ago |
|
wangning
|
f730c8fb42
|
fixbug
|
7 years ago |
|
wangning
|
7652436c54
|
Merge branch 'master' of https://git.royalpay.com.au/git/royalv2.manage
|
7 years ago |
|
wangning
|
ddd7b5e795
|
fixbug
|
7 years ago |
|
Tayl0r
|
825b90cbca
|
fix upload file
|
7 years ago |
|
Tayl0r
|
ad20121fc0
|
file service
|
7 years ago |
|
yixian
|
3919ae39b6
|
Merge remote-tracking branch 'origin/master'
|
7 years ago |
|
yixian
|
c7c42b064d
|
order expiry setter
|
7 years ago |
|
Tayl0r
|
ec4cf679e8
|
Merge remote-tracking branch 'origin/master'
|
7 years ago |
|
Tayl0r
|
f077f778b3
|
fix js
|
7 years ago |
|
wangning
|
2cb3f6ef3d
|
update
|
7 years ago |
|
wangning
|
c2c7f87bc0
|
logo
|
7 years ago |
|
wangning
|
335829aa59
|
fixbug
|
7 years ago |
|
wangning
|
2a55ed7198
|
update
|
7 years ago |
|
wangning
|
cf05d18db6
|
update
|
7 years ago |
|
wangning
|
bb9c239184
|
Merge branch 'master' of https://git.royalpay.com.au/git/royalv2.manage
|
7 years ago |
|
wangning
|
8021bc2293
|
update
|
7 years ago |
|
wangning
|
c86ac89229
|
update
|
7 years ago |
|
yixian
|
c6bd5aeea3
|
cashier
|
7 years ago |
|
yixian
|
00ac171d37
|
Merge remote-tracking branch 'origin/master'
|
7 years ago |
|
yixian
|
e1d1409b28
|
logback cfg
|
7 years ago |
|
eason.qian
|
b9b722b66f
|
fix
|
7 years ago |
|
eason.qian
|
613f04219d
|
fix
|
7 years ago |
|
eason.qian
|
0763860669
|
Merge remote-tracking branch 'origin/master'
|
7 years ago |
|
eason.qian
|
5c1bb44b8e
|
fix
|
7 years ago |
|
Tayl0r
|
37daac03e3
|
修改背景 登录框样式
|
7 years ago |
|
eason.qian
|
68557f31ae
|
fix
|
7 years ago |
|
eason.qian
|
cf14420dc0
|
Merge remote-tracking branch 'origin/master'
|
7 years ago |
|
eason.qian
|
2d4c434d9d
|
fix
|
7 years ago |
|
yixian
|
80f3b16626
|
logback cfg
|
7 years ago |
|
wangning
|
bb49ca60f7
|
add log
|
7 years ago |
|
yuan
|
1a8a4ab94b
|
Merge remote-tracking branch 'origin/master'
|
7 years ago |
|
yuan
|
fd6db4c432
|
fix~
|
7 years ago |
|
wangning
|
9a2f1bce4b
|
Merge branch 'master' of https://git.royalpay.com.au/git/royalv2.manage
|
7 years ago |
|
wangning
|
71d62c4a20
|
update
|
7 years ago |
|
Tayl0r
|
a68caef0fb
|
merchant login from qrcode
|
7 years ago |
|
yixian
|
684ca08272
|
Merge remote-tracking branch 'origin/master'
|
7 years ago |
|
yixian
|
ad33e29b3d
|
cashier
|
7 years ago |
|
yuan
|
f9d47980fd
|
Merge remote-tracking branch 'origin/master'
|
7 years ago |
|
yuan
|
47fc73f389
|
FIX~
|
7 years ago |
|
yixian
|
da0a77d339
|
Merge remote-tracking branch 'origin/master'
|
7 years ago |
|
yixian
|
34f893a210
|
cashier
|
7 years ago |
|
Tayl0r
|
9b97acd4fc
|
ignore
|
7 years ago |
|
wangning
|
962985fa0a
|
update
|
7 years ago |
|
wangning
|
63aef36f4e
|
Merge branch 'master' of https://git.royalpay.com.au/git/royalv2.manage
|
7 years ago |
|
wangning
|
da4df801cb
|
update
|
7 years ago |
|
yuan
|
cb094949cc
|
Merge branch 'master' of https://git.royalpay.com.au/git/royalv2.manage
|
7 years ago |
|
yuan
|
ee4de72a79
|
update
|
7 years ago |
|
wangning
|
5c0292e3ad
|
sql
|
7 years ago |
|
wangning
|
93d5e2de71
|
update
|
7 years ago |
|
wangning
|
7e3489847c
|
modify client_rates column
|
7 years ago |
|
wangning
|
30bc904c89
|
Merge branch 'master' of https://git.royalpay.com.au/git/royalv2.manage
|
7 years ago |
|
wangning
|
ee5684f586
|
modify approve column
|
7 years ago |
|
eason.qian
|
aa9d5d09d0
|
fix
|
7 years ago |
|
wangning
|
b3be2a3193
|
fix reset_password html
|
7 years ago |
|
eason.qian
|
71774b7c9d
|
Merge remote-tracking branch 'origin/master'
|
7 years ago |
|
eason.qian
|
bbe2868696
|
fix
|
7 years ago |
|
yixian
|
45d3716a86
|
pay notice
|
7 years ago |
|
wangning
|
87a0ff4514
|
Merge branch 'master' of https://git.royalpay.com.au/git/royalv2.manage
|
7 years ago |
|
wangning
|
34306bb722
|
update
|
7 years ago |
|
eason.qian
|
6ab78a1356
|
fix
|
7 years ago |
|
eason.qian
|
a048d47e6c
|
fix
|
7 years ago |
|
eason.qian
|
69aa0922e1
|
Merge remote-tracking branch 'origin/master'
|
7 years ago |
|
eason.qian
|
299b4294d8
|
fix
|
7 years ago |
|
wangning
|
0aa837d35a
|
update
|
7 years ago |
|
eason.qian
|
04f969c434
|
fix
|
7 years ago |
|
eason.qian
|
8ec69f4e01
|
Merge remote-tracking branch 'origin/master'
|
7 years ago |
|
eason.qian
|
fcad128ac5
|
fix
|
7 years ago |
|
wangning
|
ececb021e6
|
update
|
7 years ago |
|
yuan
|
8073bf876c
|
更改BD销售页行业展示，增加表格导出
|
7 years ago |
|
yuan
|
5f8acdb6d2
|
更换登录页与过度页图片
|
7 years ago |
|
yixian
|
7db1195937
|
init
|
7 years ago |
