wangning
|
48e5624cb2
|
merge conflict
|
7 years ago |
wangning
|
f4345b7096
|
update
|
7 years ago |
wangning
|
2936b1072e
|
order bind qrcode version
|
7 years ago |
yuan
|
873ec92e6c
|
fix~
|
7 years ago |
yuan
|
e00d2bf155
|
fix ~
|
7 years ago |
yuan
|
1c8cb8714e
|
商户管理增加merchangt pay gst开关选项,fix bug
|
7 years ago |
yuan
|
312193b298
|
商户端增加partner_invoice.html
|
7 years ago |
wangning
|
264ec82506
|
Merge branch 'develop' of https://git.royalpay.com.au/git/royalv2.manage into develop
|
7 years ago |
eason.qian
|
2707c2b195
|
fix
|
7 years ago |
yuan
|
c72612110d
|
fix html
|
7 years ago |
yuan
|
580ea4ee05
|
商户管理增加merchant_id筛选
|
7 years ago |
eason.qian
|
2b928e930d
|
Merge branch 'develop'
|
7 years ago |
eason.qian
|
210408268e
|
fix
|
7 years ago |
eason.qian
|
243de321e1
|
Merge remote-tracking branch 'origin/develop' into develop
|
7 years ago |
eason.qian
|
ace0dcb970
|
fix
|
7 years ago |
yuan
|
8d80e1ff97
|
Merge remote-tracking branch 'origin/develop' into develop
|
7 years ago |
yuan
|
a288696a61
|
fix~
|
7 years ago |
eason.qian
|
62a258ccfb
|
fix
|
7 years ago |
Tayl0r
|
e3ff27b07b
|
[Y] 修改新商户号的测试商户id
|
7 years ago |
yuan
|
da999e6c85
|
Merge remote-tracking branch 'origin/develop' into develop
|
7 years ago |
eason.qian
|
0f045d65fe
|
fix
|
7 years ago |
yuan
|
9af1015a1b
|
fix ~
|
7 years ago |
eason.qian
|
6ada3a95f7
|
Merge branch 'new_partner_dashboard' into develop
|
7 years ago |
yuan
|
db31a54f52
|
fix bug
|
7 years ago |
eason.qian
|
08f873e30a
|
Merge branch 'new_partner_dashboard' into develop
|
7 years ago |
yuan
|
c7fcb2c867
|
fix~
|
7 years ago |
yuan
|
ce29c7f86f
|
fix bug
|
7 years ago |
yuan
|
51dc7988f2
|
fix bug
|
7 years ago |
yuan
|
6aaa589ad2
|
修改html
|
7 years ago |
yuan
|
0a1feb9671
|
修改html
|
7 years ago |
wangning
|
2228a0cc45
|
bug fix
|
7 years ago |
yuan
|
025d24c358
|
fix bug
|
7 years ago |
yuan
|
3fff080c23
|
fix bug
|
7 years ago |
yuan
|
1c77a938e2
|
Merge remote-tracking branch 'origin/new_partner_dashboard' into new_partner_dashboard
|
7 years ago |
yuan
|
e28adf6a23
|
fix bug
|
7 years ago |
eason.qian
|
bfc1617fcf
|
fix
|
7 years ago |
yuan
|
d367f9c615
|
fix bug
|
7 years ago |
yuan
|
33b3795a58
|
fix partner dashboard
|
7 years ago |
yuan
|
fbae009d06
|
modify html
|
7 years ago |
wangning
|
e746485938
|
update
|
7 years ago |
wangning
|
1655144454
|
Merge branch 'develop'
|
7 years ago |
yuan
|
1561c75e50
|
修改partner_dashboard.html
|
7 years ago |
wangning
|
4f780978dd
|
update
|
7 years ago |
wangning
|
9e788f0581
|
contract add query param
|
7 years ago |
yuan
|
0bef940daa
|
修改partner dashboard
|
7 years ago |
wangning
|
414c4a783d
|
Merge branch 'develop' of https://git.royalpay.com.au/git/royalv2.manage into develop
|
7 years ago |
yixian
|
c6b7a5d2d4
|
error processing
|
7 years ago |
eason.qian
|
921936404b
|
fix
|
7 years ago |
eason.qian
|
4fbb104b7e
|
fix
|
7 years ago |
eason.qian
|
b9efe148ec
|
fix
|
7 years ago |
eason.qian
|
cb13558735
|
fix
|
7 years ago |
eason.qian
|
7e404d685f
|
fix
|
7 years ago |
eason.qian
|
c04d6d93c4
|
fix
|
7 years ago |
eason.qian
|
86bc87c381
|
fix
|
7 years ago |
eason.qian
|
90c13fc328
|
fix
|
7 years ago |
wangning
|
50eb0d8180
|
add contract analysis & pageable
|
7 years ago |
eason.qian
|
f31b05ca74
|
fix
|
7 years ago |
eason.qian
|
c1302de12a
|
fix
|
7 years ago |
wangning
|
3b53be6de3
|
update contract
|
7 years ago |
wangning
|
946b773031
|
update
|
7 years ago |
wangning
|
7dc7748f7e
|
update contract
|
7 years ago |
wangning
|
68c896aae2
|
update contract Abnormal process
|
7 years ago |
eason.qian
|
481fa42eb5
|
fix
|
7 years ago |
yuan
|
3d7bddfc92
|
modify html
|
7 years ago |
yuan
|
df901c8745
|
fix bug
|
7 years ago |
wangning
|
26e7eee4af
|
update aggregate QR board template
|
7 years ago |
eason.qian
|
df4c8f90d0
|
fix
|
7 years ago |
eason.qian
|
187298aad8
|
fix
|
7 years ago |
wangning
|
d84064a62b
|
fixbug tax_amount
|
7 years ago |
wangning
|
a40c046e41
|
fixbug
|
7 years ago |
wangning
|
bda4f507ac
|
Merge branch 'develop' of https://git.royalpay.com.au/git/royalv2.manage into develop
|
7 years ago |
wangning
|
e4018d4939
|
update manual settle
|
7 years ago |
yuan
|
ed6aa9c00c
|
fix bug
|
7 years ago |
wangning
|
ab6c1dc34b
|
Merge branch 'develop' of https://git.royalpay.com.au/git/royalv2.manage into develop
|
7 years ago |
wangning
|
7cd32650b6
|
Merge branch 'hotfix' into develop
# Conflicts:
# src/main/java/au/com/royalpay/payment/manage/settlement/core/impls/ManualSettleSupportImpl.java
|
7 years ago |
wangning
|
24510cf6e6
|
tmp
|
7 years ago |
yuan
|
9c06de37d9
|
Merge branch 'hotfix' into develop
|
7 years ago |
yuan
|
7cb99fbc0c
|
fix bug
|
7 years ago |
yuan
|
7a7f7c2319
|
modify html
|
7 years ago |
eason.qian
|
d2ee955ca8
|
fix
|
7 years ago |
eason.qian
|
34605db062
|
fix
|
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
|
35c97f7182
|
Merge branch 'master' of https://git.royalpay.com.au/git/royalv2.manage
|
7 years ago |
wangning
|
7e35483150
|
update
|
7 years ago |
yuan
|
61152808b4
|
商户端增加提现功能
|
7 years ago |
yuan
|
8f14cb47a2
|
update
|
7 years ago |
wangning
|
0fea884bd1
|
update
|
7 years ago |
wangning
|
9bd674275f
|
update
|
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
|
27c5d25eb6
|
delete manager manual_settle
|
7 years ago |
wangning
|
3cf45ef0cc
|
Merge branch 'develop_manual_settle' into develop
# Conflicts:
# src/db/modify.sql
|
7 years ago |
wangning
|
243a085b44
|
add manual settle
|
7 years ago |
yuan
|
41bdbdfe3c
|
fix bug
|
7 years ago |
wangning
|
4d2a27c2ca
|
update
|
7 years ago |
wangning
|
caadaa605d
|
update
|
7 years ago |
yuan
|
c6ba497390
|
活动管理增加字段
|
7 years ago |
wangning
|
5ed445e8a9
|
mondelay 周一18点之前停止操作
|
7 years ago |
yuan
|
bc82d0f6b7
|
fix html
|
7 years ago |
yuan
|
f8a17f97e9
|
fix html
|
7 years ago |
yuan
|
1c52f90c33
|
fix html
|
7 years ago |
eason.qian
|
2c0a360ddd
|
Merge branch 'mondelay' into develop
|
7 years ago |
yuan
|
bad6e6aebd
|
修改页面
|
7 years ago |
eason.qian
|
9e6b60de72
|
fix
|
7 years ago |
eason.qian
|
b49f43c3bb
|
Merge branch 'mondelay' into develop
|
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
|
68be8297b0
|
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 |
yuan
|
42ea3adcd7
|
fix~
|
7 years ago |
eason.qian
|
f63f6bc001
|
fix
|
7 years ago |
eason.qian
|
ca1c61d666
|
fix
|
7 years ago |
yuan
|
8ce79a8e16
|
增加活动开始与结束时间
|
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
|
08426e8a5a
|
fix
|
7 years ago |
yuan
|
9992cc0294
|
fix~
|
7 years ago |
yuan
|
b9d2fd2cf8
|
fix html
|
7 years ago |
wangning
|
f48ccb5325
|
add contract analysis webview
|
7 years ago |
eason.qian
|
4d23abd2a3
|
fix
|
7 years ago |
eason.qian
|
7ee71d67e8
|
Merge branch 'agreement' into develop
|
7 years ago |
Tayl0r
|
4bd4820126
|
[Y] 修改上传文件大小
|
7 years ago |
eason.qian
|
e772fef8c3
|
new act
|
7 years ago |
yuan
|
fca8e8695c
|
fix~
|
7 years ago |
yuan
|
f278517d63
|
add html
|
7 years ago |
eason.qian
|
585401834b
|
new act
|
7 years ago |
yixian
|
d778ad622c
|
web error
|
7 years ago |
eason.qian
|
392e1814e5
|
fix
|
7 years ago |
yixian
|
de825dee0d
|
Merge branch 'hotfix_20180306_exporterror' into develop
|
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
|
b2dccadab2
|
client support multiple settles in one day
|
7 years ago |
eason.qian
|
89a9c1c061
|
fix change logo
|
7 years ago |
yixian
|
84b0fdaa85
|
hide gst in customer's view
|
7 years ago |
yixian
|
ed810dcefa
|
hide gst in customer's view
|
7 years ago |
yixian
|
069f409590
|
Merge remote-tracking branch 'origin/develop' into develop
# Conflicts:
# src/main/java/au/com/royalpay/payment/manage/merchants/core/impls/ClientManagerImpl.java
|
7 years ago |
yixian
|
fa579346c5
|
Merge branch 'hotfix20180227gst' into develop
|
7 years ago |
yixian
|
ab82fb7661
|
Merge branch 'hotfix20180227gst'
|
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
|
464fc1b474
|
update
|
7 years ago |
wangning
|
e8478bb641
|
update
|
7 years ago |
wangning
|
4eb69c41a0
|
update
|
7 years ago |
wangning
|
1fb82e3521
|
settlement add Tax amount
|
7 years ago |
yuan
|
33e3ef225f
|
fix~
|
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 |
Tayl0r
|
599864897f
|
Merge branch 'develop'
|
7 years ago |
Tayl0r
|
dc0c2d9275
|
[Y] 修复支付模板页
|
7 years ago |
yuan
|
abce303d14
|
dashboard增加获取支付限额接口
|
7 years ago |
eason.qian
|
54e8c5bb6e
|
Merge branch 'develop'
|
7 years ago |
yuan
|
8e5e533678
|
账号修改,隐藏组织
|
7 years ago |
yuan
|
fea62f737f
|
fix 账号组织bug,过滤manangerList
|
7 years ago |
yuan
|
e968c49c2b
|
fix 账号组织bug
|
7 years ago |
yixian
|
c71e629188
|
gst support
|
7 years ago |
yuan
|
bf9a4f81e0
|
二级组织费率限制
|
7 years ago |
eason.qian
|
e53f2eab57
|
Merge branch 'develop'
|
7 years ago |
Tayl0r
|
ce38db718d
|
ignore
|
7 years ago |
Tayl0r
|
25416d5478
|
Merge branch 'develop'
|
7 years ago |
Tayl0r
|
eb5fdb48df
|
[Y] 新增AlipayOnline对账查询
|
7 years ago |
eason.qian
|
a9fdea18c2
|
Merge branch 'develop'
|
7 years ago |
eason.qian
|
16095a9122
|
fix
|
7 years ago |
yuan
|
d21d2210c6
|
修改一级组织显示,账号管理增加二级组织筛选
|
7 years ago |
yuan
|
7982c078cd
|
fix~
|
7 years ago |
yuan
|
8de1d7b688
|
修改页面年份显示
|
7 years ago |
yuan
|
345c48ca8c
|
修改‘合伙人提成’与‘BD提成’页面年份显示
|
7 years ago |
yuan
|
ed380d8f9f
|
fix~
|
7 years ago |
yixian
|
3407a0f9cf
|
Merge branch 'hotfix20180131invoice' into develop
|
7 years ago |
yixian
|
afb9586017
|
asynchronize redirect after payment
|
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
|
22d9738920
|
QB top up
|
7 years ago |
yuan
|
64d17e4027
|
Merge branch 'branch_v1' into develop
|
7 years ago |
yuan
|
86d07c5f69
|
fix~
|
7 years ago |
eason.qian
|
1bdcf5fa52
|
fix
|
7 years ago |
eason.qian
|
262ce70a7d
|
fix
|
7 years ago |
yuan
|
511faafdda
|
fix~
|
7 years ago |
yuan
|
7b563647f4
|
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
|
7e050369ee
|
Merge branch 'mergeReferrer&CityPartner'
# Conflicts:
# src/db/modify.sql
|
7 years ago |
yuan
|
1d80f8fcc7
|
fix~
|
7 years ago |
yuan
|
846bc84c0a
|
Merge remote-tracking branch 'origin/develop' into develop
|
7 years ago |
yuan
|
9b6c378506
|
fix~
|
7 years ago |
yuan
|
3b2718e6fe
|
fix~
|
7 years ago |
eason.qian
|
8d7548f8d6
|
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 |
wangning
|
e734b44f9a
|
finish merge referrer & cityPartner
|
7 years ago |
wangning
|
902ee0aa3f
|
tmp
|
7 years ago |
wangning
|
9d72ee8451
|
tmp
|
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
|
785c182691
|
Merge branch 'hotfix20180115_cashbackdelaysettle' into develop
|
7 years ago |
wangning
|
9730e6be3d
|
Merge branch 'develop' of https://git.royalpay.com.au/git/royalv2.manage into develop
|
7 years ago |
wangning
|
ce65ae462a
|
update
|
7 years ago |
wangning
|
3032d6315b
|
update
|
7 years ago |
wangning
|
9f8157372f
|
update
|
7 years ago |
wangning
|
2eea4ed50c
|
calculat type
|
7 years ago |
yuan
|
41ec087b72
|
增加合伙人提成方式筛选,增加商户最低费率检测
|
7 years ago |
wangning
|
74eca570af
|
Merge branch 'agent' into develop
|
7 years ago |
wangning
|
cfb67ac4de
|
agent commission finish
|
7 years ago |
yixian
|
0681a81bb4
|
sysParams
|
7 years ago |
wangning
|
3bbdd7968a
|
tmp
|
7 years ago |
wangning
|
a02314e294
|
Customer impression task
|
7 years ago |
wangning
|
b46745ed55
|
tmp
|
7 years ago |
wangning
|
fb1f4f95b2
|
update
|
7 years ago |
yuan
|
72244fef3b
|
fix~
|
7 years ago |
wangning
|
d93445eec2
|
tmp
|
7 years ago |
eason.qian
|
8850543d30
|
fix
|
7 years ago |
wangning
|
eefec84fc7
|
Merge branch 'develop' of https://git.royalpay.com.au/git/royalv2.manage into develop
|
7 years ago |
wangning
|
c84bb59102
|
Merge branch 'Jpush' into develop
|
7 years ago |
wangning
|
9df05a5ee1
|
update
|
7 years ago |
yuan
|
c964f93649
|
fix~
|
7 years ago |
eason.qian
|
49609d0f2c
|
fix
|
7 years ago |
yuan
|
2b377006cb
|
Merge remote-tracking branch 'origin/develop' into develop
|
7 years ago |
yuan
|
c53ea04d2e
|
fix~
|
7 years ago |
eason.qian
|
f1f1a62e31
|
fix add orgmanager Role
|
7 years ago |
eason.qian
|
bace0e420e
|
fix
|
7 years ago |
yuan
|
0cbefe6558
|
fix~
|
7 years ago |
yuan
|
c10502580f
|
fix~
|
7 years ago |
yuan
|
d8041ca3ce
|
fix~
|
7 years ago |
yuan
|
66775e24c2
|
组织管理增加二级筛选,用户管理,交易流水,增加二级代理筛选
|
7 years ago |
wangning
|
9b8b9639c0
|
update
|
7 years ago |
wangning
|
2323459f31
|
finish refactor the message
|
7 years ago |
yuan
|
af0c5a8cae
|
Merge remote-tracking branch 'origin/develop' into develop
|
7 years ago |
yuan
|
b7abc5b78f
|
商户详情里增加Local Merchant按钮
|
7 years ago |
yixian
|
fba967152d
|
points
|
7 years ago |
wangning
|
06b857eb51
|
update
|
7 years ago |
wangning
|
7372c93190
|
phone top up list
|
7 years ago |
yixian
|
bc4122226b
|
settle warnings
|
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 |
Tayl0r
|
e629c97005
|
修改合规文件移动端显示
|
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
|
8827728559
|
fix
|
7 years ago |
yixian
|
359f357f2c
|
Merge remote-tracking branch 'origin/master'
|
7 years ago |
yixian
|
381114e974
|
order expiry setter
|
7 years ago |
eason.qian
|
c983035613
|
fix
|
7 years ago |
yuan
|
573ae86bff
|
fix~
|
7 years ago |
Tayl0r
|
bfaee6b248
|
remove scroll
|
7 years ago |
Tayl0r
|
c4353dbae1
|
remove forbidden scroll
|
7 years ago |
Tayl0r
|
ec4cf679e8
|
Merge remote-tracking branch 'origin/master'
|
7 years ago |
Tayl0r
|
f077f778b3
|
fix js
|
7 years ago |
wangning
|
c2c7f87bc0
|
logo
|
7 years ago |
yixian
|
c6bd5aeea3
|
cashier
|
7 years ago |
Tayl0r
|
37daac03e3
|
修改背景 登录框样式
|
7 years ago |
yuan
|
1a8a4ab94b
|
Merge remote-tracking branch 'origin/master'
|
7 years ago |
yuan
|
fd6db4c432
|
fix~
|
7 years ago |
yixian
|
ad33e29b3d
|
cashier
|
7 years ago |
yixian
|
34f893a210
|
cashier
|
7 years ago |
yuan
|
8073bf876c
|
更改BD销售页行业展示,增加表格导出
|
7 years ago |
yuan
|
5f8acdb6d2
|
更换登录页与过度页图片
|
7 years ago |