1093 Commits (4291fd4ec3324d4479cf1016eb9bcce700755163)
 

Author SHA1 Message Date
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 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
yuan 8bb741bc71 Merge remote-tracking branch 'origin/develop' into develop
7 years ago
yuan da91e3cbb1 fix html
7 years ago
wangning eec7730e29 Merge branch 'develop' of https://git.royalpay.com.au/git/royalv2.manage into develop
7 years ago
wangning b6e9cf2d55 Merge branch 'fixbug' into develop
7 years ago
wangning bf8f4750ea fix
7 years ago
yuan b87ea5e727 fix html
7 years ago
wangning 215949e30a Merge branch 'develop' of https://git.royalpay.com.au/git/royalv2.manage into develop
7 years ago
wangning c72c0936d8 add doc
7 years ago
yuan 84c08eae1b fix html
7 years ago
eason.qian 10be585cc0 Merge branch 'develop'
7 years ago
yuan fc65cfea0e fix~
7 years ago
eason.qian e6add4e867 Merge branch 'develop'
7 years ago
eason.qian 86e1b7b03c fix
7 years ago
eason.qian 1bab6653b6 Merge branch 'develop'
7 years ago
eason.qian f1c2894897 fix
7 years ago
yuan 6fae98440a fix~
7 years ago
yuan 3bc97503af fix~
7 years ago
yuan a5a68fff2f fix~
7 years ago
yuan 03477c83f0 fix~
7 years ago
yuan 417ce0a261 增加商户号管理页面
7 years ago
eason.qian c2f16071a4 Merge branch 'develop'
7 years ago
eason.qian 227b712f8f fix
7 years ago
eason.qian 781d116000 Merge branch 'develop'
7 years ago
eason.qian 5f9b173fe6 add ip location
7 years ago
wangning d562ae208d Merge branch 'master' of https://git.royalpay.com.au/git/royalv2.manage
7 years ago
wangning e3c7927bab Merge branch 'develop' of https://git.royalpay.com.au/git/royalv2.manage into develop
7 years ago
wangning b239a9a02e fix bug
7 years ago
eason.qian 4e3e87b460 fix
7 years ago
wangning ff05fadea3 update
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 91c8b1a398 add sql
7 years ago
yuan 1ff7c46bc3 增加sub_merchant_id修改列表
7 years ago
yuan 2e44dd4214 商户管理增加store_photo字段
7 years ago
wangning baec160c2d Merge branch 'develop_postpone' into develop
7 years ago
wangning 8c5b02fc92 client postpone
7 years ago
yuan f44036b04c fix`
7 years ago