yuan
|
58d4b60f16
|
fix~~
|
6 years ago |
|
yuan
|
fc22769d38
|
fix~~
|
6 years ago |
|
yuan
|
eb593c6c33
|
Merge remote-tracking branch 'origin/develop' into develop
|
6 years ago |
|
yuan
|
b713f8f1fd
|
fix~~
|
6 years ago |
wangning
|
11cde27af2
|
update industry
|
6 years ago |
|
yuan
|
4ebf2f25d6
|
fix~~
|
6 years ago |
|
yuan
|
451b6f2a7b
|
fix~~
|
6 years ago |
|
yuan
|
e6ac37fd05
|
fix~~
|
6 years ago |
|
yuan
|
bc971bd8b5
|
fix~~
|
6 years ago |
|
yuan
|
40d2e729a1
|
fix~~
|
6 years ago |
|
yuan
|
455eedbcd5
|
Merge remote-tracking branch 'origin/develop' into develop
|
6 years ago |
|
yuan
|
5b7349dbb8
|
fix~~
|
6 years ago |
|
wangning
|
843dbce89f
|
update
|
6 years ago |
|
yuan
|
49ad834a79
|
fix~~
|
6 years ago |
|
yuan
|
d8bf233bd3
|
fix~~
|
6 years ago |
eason.qian
|
4cb89bf3ab
|
fix
|
6 years ago |
|
yuan
|
7f69e34750
|
fix~~
|
6 years ago |
|
yuan
|
7c4529e382
|
fix~~
|
6 years ago |
|
yuan
|
ba0b61b701
|
fix~~
|
6 years ago |
|
yuan
|
1d5fd9f31e
|
fix~~
|
6 years ago |
|
yuan
|
8b8d2adb15
|
fix~~
|
6 years ago |
|
yuan
|
e28a3f1f9f
|
add ~
|
6 years ago |
|
yuan
|
30210a2c44
|
fix~
|
6 years ago |
|
yuan
|
e0bde1934d
|
add~
|
6 years ago |
|
yuan
|
c76c1f3a63
|
fix~
|
6 years ago |
|
yuan
|
7c8188466c
|
fix~
|
6 years ago |
|
yuan
|
198953cbad
|
Merge branch 'clientApply' into develop
|
6 years ago |
|
yuan
|
c287b2ec13
|
fix~
|
6 years ago |
|
yuan
|
18e9865b77
|
Merge remote-tracking branch 'origin/clientApply' into clientApply
# Conflicts:
# src/main/java/au/com/royalpay/payment/manage/application/core/impls/SimpleClientApplyServiceImpl.java
# src/main/ui/merchant_application.html
|
6 years ago |
|
wangning
|
02903d5055
|
Merge branch 'clientApply' into develop
# Conflicts:
# src/main/ui/merchant_application.html
# src/main/ui/static/css/merchant_application.css
# src/main/ui/static/merchantapplication/merchant_application.js
|
6 years ago |
|
wangning
|
55e7c465b3
|
Merge branch 'hotfix' into develop
|
6 years ago |
|
wangning
|
d03ea655a4
|
update
|
6 years ago |
|
wangning
|
0b70be1e4e
|
Merge branch 'develop' of https://git.royalpay.com.au/git/royalv2.manage into develop
|
6 years ago |
|
wangning
|
87a4dd4ac6
|
Merge branch 'hotfix' into develop
|
6 years ago |
|
wangning
|
c327748b61
|
update
|
6 years ago |
|
yuan
|
483b3aa9c1
|
fix~
|
6 years ago |
|
wangning
|
943da647cb
|
update
|
6 years ago |
|
wangning
|
4bab6f1223
|
update
|
6 years ago |
|
wangning
|
b5f2f1ed29
|
update
|
6 years ago |
|
wangning
|
d9a6af58bb
|
update
|
6 years ago |
|
wangning
|
73d07ba731
|
SettleMent Estimate alipayOnline
|
6 years ago |
|
yuan
|
08f2736c8e
|
Merge remote-tracking branch 'origin/develop' into develop
|
6 years ago |
|
yuan
|
89016d48f8
|
add getaway 13
|
6 years ago |
|
yuan
|
299f69957a
|
fix~
|
6 years ago |
|
yuan
|
f4da89ddcd
|
fix~
|
6 years ago |
|
wangning
|
24f3e1f356
|
Merge branch 'clientApply' of https://git.royalpay.com.au/git/royalv2.manage into clientApply
|
6 years ago |
|
wangning
|
d51a174b7e
|
update
|
6 years ago |
|
wangning
|
f502ac2f80
|
update
|
6 years ago |
|
eason.qian
|
9944407894
|
自助开通合规流程改造
|
6 years ago |
|
yuan
|
74a59a1bd3
|
fix~
|
6 years ago |
|
yuan
|
19f0045183
|
fix~
|
6 years ago |
|
wangning
|
914525f150
|
Merge remote-tracking branch 'origin/clientApply' into clientApply
# Conflicts:
# src/main/ui/merchant_application.html
|
6 years ago |
|
wangning
|
ce27310c40
|
update
|
6 years ago |
|
yuan
|
1ff35dc8d1
|
fix~
|
6 years ago |
|
yuan
|
7c8c0c56c9
|
fix~
|
6 years ago |
|
wangning
|
41376c740f
|
update
|
6 years ago |
|
wangning
|
f6be2111f2
|
merge conflict
|
6 years ago |
|
yuan
|
2337e30251
|
fix~
|
6 years ago |
|
wangning
|
047ba2b7d7
|
update url
|
6 years ago |
|
yuan
|
9889521acd
|
fix~
|
6 years ago |
|
wangning
|
0cbd63031f
|
update
|
6 years ago |
|
wangning
|
67062c1930
|
add risk record authority
|
6 years ago |
|
yuan
|
de98a7c279
|
add
|
6 years ago |
|
wangning
|
11cf6b5819
|
update
|
6 years ago |
|
yuan
|
4c3360f9e5
|
fix html
|
6 years ago |
|
yuan
|
963c7951de
|
修改红包返现页面
|
6 years ago |
|
wangning
|
9a51b08d41
|
change microapp to MiniProgram
|
6 years ago |
|
yuan
|
68339f4027
|
订单查询增加gateway选项
|
6 years ago |
|
yuan
|
139711f662
|
fix html
|
6 years ago |
|
yuan
|
8f88d8084b
|
fix bug
|
6 years ago |
|
wangning
|
ec0ead8d68
|
update
|
6 years ago |
|
wangning
|
85b0f7d653
|
Merge branch 'develop' of https://git.royalpay.com.au/git/royalv2.manage into develop
|
6 years ago |
|
wangning
|
1d666071ff
|
add bill page
|
6 years ago |
|
yuan
|
0ce6b156dd
|
fix html~~~
|
6 years ago |
|
yuan
|
77621c6418
|
fix~
|
6 years ago |
|
wangning
|
536ea593b0
|
Merge branch 'hotfix_2' into develop
|
6 years ago |
|
wangning
|
194b5d60a2
|
fix bug
|
6 years ago |
|
wangning
|
42a103901a
|
Merge branch 'develop' of https://git.royalpay.com.au/git/royalv2.manage into develop
|
6 years ago |
|
wangning
|
14854979f8
|
close Estimate future interface
|
6 years ago |
|
yuan
|
bce5a86aa4
|
fix bug~
|
6 years ago |
|
yuan
|
c0fffb94e3
|
fix html
|
6 years ago |
|
yuan
|
2f2d21f03e
|
fix~
|
6 years ago |
|
yuan
|
f3f6af80f6
|
商户端增商户订单ID生成二维码功能
|
6 years ago |
|
yuan
|
631f705000
|
dashboard交易额增加缓存
|
6 years ago |
|
yuan
|
015e1e388d
|
风控记录增加筛选
|
6 years ago |
|
eason.qian
|
38261ec614
|
fix
|
6 years ago |
|
wangning
|
6616a10add
|
Merge branch 'develop' of https://git.royalpay.com.au/git/royalv2.manage into develop
|
7 years ago |
|
wangning
|
4c5ffc129f
|
Merge branch 'develop' into develop_client_config
|
7 years ago |
|
yuan
|
ae8d4a66ba
|
fix html~
|
7 years ago |
|
wangning
|
ca23d42860
|
merge conflicts
|
7 years ago |
|
eason.qian
|
969e3ac2ee
|
fix
|
7 years ago |
|
eason.qian
|
46fe387a69
|
fix
|
7 years ago |
|
wangning
|
dc4c955395
|
fix bug
|
7 years ago |
|
wangning
|
4efcb964b5
|
Merge branch 'develop' of https://git.royalpay.com.au/git/royalv2.manage into develop
|
7 years ago |
|
wangning
|
35f66bf11a
|
Merge branch 'develop_risk' into develop
# Conflicts:
# src/db/modify.sql
|
7 years ago |
|
yuan
|
ee3e71e5c5
|
fix html~
|
7 years ago |
|
yuan
|
f4d5bdabaf
|
fix html~
|
7 years ago |
|
yuan
|
22c6e0aa5a
|
fix html~
|
7 years ago |
yixian
|
bca940a8c5
|
document update, php demo update
|
7 years ago |
|
eason.qian
|
ff80fbe56d
|
fix
|
7 years ago |
|
wangning
|
f4ee21ae6a
|
update
|
7 years ago |
|
wangning
|
b71cfdaa5c
|
update
|
7 years ago |
|
wangning
|
942acf08ba
|
update
|
7 years ago |
|
wangning
|
47df91b1c5
|
add manage web
|
7 years ago |
|
yuan
|
76d9b65b73
|
fix html
|
7 years ago |
|
yuan
|
6866c263ed
|
增加common_sub_merchant_id switch
|
7 years ago |
|
wangning
|
33db182dfb
|
tmp
|
7 years ago |
|
yuan
|
858494290f
|
Merge remote-tracking branch 'origin/develop' into develop
|
7 years ago |
|
yuan
|
159a565889
|
fix html
|
7 years ago |
|
eason.qian
|
4291fd4ec3
|
Merge remote-tracking branch 'origin/develop' into develop
|
7 years ago |
|
eason.qian
|
07f2474892
|
fix
|
7 years ago |
|
yuan
|
4b8ba85930
|
fix html
|
7 years ago |
|
yuan
|
3c79262ccd
|
fix html
|
7 years ago |
|
eason.qian
|
ae88cf1a10
|
fix
|
7 years ago |
|
eason.qian
|
bacde16fea
|
fix
|
7 years ago |
|
eason.qian
|
49ac845d23
|
fix
|
7 years ago |
|
wangning
|
51fdf932c1
|
tmp
|
7 years ago |
|
wangning
|
5e4e794d6d
|
Merge branch 'develop' of https://git.royalpay.com.au/git/royalv2.manage into develop
|
7 years ago |
|
wangning
|
1dfb71ab45
|
Merge branch 'fixbug' into develop
|
7 years ago |
|
wangning
|
a0c6ff984d
|
fixbug
|
7 years ago |
|
wangning
|
78688d7330
|
tmp
|
7 years ago |
|
yuan
|
da91e3cbb1
|
fix html
|
7 years ago |
|
wangning
|
97220886c5
|
tmp
|
7 years ago |
|
yuan
|
b87ea5e727
|
fix html
|
7 years ago |
|
wangning
|
c82400165e
|
tmp
|
7 years ago |
|
yuan
|
84c08eae1b
|
fix html
|
7 years ago |
|
yuan
|
fc65cfea0e
|
fix~
|
7 years ago |
|
yuan
|
6fae98440a
|
fix~
|
7 years ago |
|
yuan
|
a5a68fff2f
|
fix~
|
7 years ago |
|
yuan
|
03477c83f0
|
fix~
|
7 years ago |
|
yuan
|
417ce0a261
|
增加商户号管理页面
|
7 years ago |
|
eason.qian
|
227b712f8f
|
fix
|
7 years ago |
|
eason.qian
|
5f9b173fe6
|
add ip location
|
7 years ago |
|
eason.qian
|
4e3e87b460
|
fix
|
7 years ago |
|
wangning
|
edf02f8c23
|
update
|
7 years ago |
|
wangning
|
d188406122
|
Merge branch 'develop' of https://git.royalpay.com.au/git/royalv2.manage into develop
|
7 years ago |
|
wangning
|
f8b4cac8d2
|
update
|
7 years ago |
|
wangning
|
88021a718c
|
add common sub_merchant_id
|
7 years ago |
|
eason.qian
|
121950e4a7
|
update app statement detail api
|
7 years ago |
|
yuan
|
1ff7c46bc3
|
增加sub_merchant_id修改列表
|
7 years ago |
|
yuan
|
2e44dd4214
|
商户管理增加store_photo字段
|
7 years ago |
|
wangning
|
a74121cc62
|
Merge branch 'develop' into develop_client_config
# Conflicts:
# src/main/java/au/com/royalpay/payment/manage/analysis/core/impls/PartnerCardDashboardServiceImp.java
# src/main/java/au/com/royalpay/payment/manage/appclient/core/impls/RetailAppServiceImp.java
|
7 years ago |
|
yuan
|
f44036b04c
|
fix`
|
7 years ago |
|
yuan
|
8fc003f87e
|
fix`
|
7 years ago |
|
yuan
|
d6de760fe0
|
fix bug
|
7 years ago |
|
yuan
|
cedbbfe97e
|
fix~
|
7 years ago |
|
yuan
|
ddb1ebd101
|
Merge branch 'settlement' into develop
|
7 years ago |
|
yuan
|
010586e3fd
|
add~
|
7 years ago |
|
yuan
|
071c05905a
|
fix~
|
7 years ago |
|
yuan
|
ae8ea53870
|
商户管理增加suburb筛选
|
7 years ago |
