msb_52843
/
dalong_mall
1
0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
2334 Commits
1 Branch
0 Tags
161 MiB
Branches Tags
${ item.name }
Create tag ${ searchTerm }
Create branch ${ searchTerm }
from 'af2ec66f48'
${ noResults }
Commit Graph

2075 Commits (af2ec66f48d96fbbd0026405ab1f85cfaa81bc57)

Author SHA1 Message Date
wangning 8de77da823 update
6 years ago
wangning d7db6a1229 update
6 years ago
wangning e27ec59a6a update
6 years ago
wangning eff977631e update
6 years ago
wangning 7af74cb593 add apply source
6 years ago
wangning 531ffd16b6 update
6 years ago
wangning ed28003e69 update
6 years ago
wangning 98101df7ac update
6 years ago
wangning 349083a52c Merge branch 'hotfix' into develop
6 years ago
wangning d9a801b431 tmp
6 years ago
wangning 47a3d005e9 Merge branch 'hotfix' into develop
6 years ago
wangning ad570266df optimum
6 years ago
wangning 6bd11ee479 Merge branch 'hotfix' into develop
6 years ago
wangning 48aaee99bb fixbug
6 years ago
wangning 7404784130 add detail
6 years ago
wangning 122d51ad2b Merge branch 'hotfix' into develop
6 years ago
wangning 4c17f89e4d fixbug
6 years ago
wangning 751206814b 商户费率自动续签，GST自动变为自己承担
6 years ago
yixian b331b211aa fix nullpointer error
6 years ago
wangning a5ff2cca40 update
6 years ago
wangning 5f0fe940cc update
6 years ago
wangning 8265e198f1 auditmodify add method getOpen_status
6 years ago
wangning 808cbc40b6 Merge branch 'develop' of https://git.royalpay.com.au/git/royalv2.manage into develop
6 years ago
wangning 3650e2f7be update
6 years ago
yuan 4c66cb13b7 商户端增加require_remark，require_custinfo开关设置，Dashboard优化，修改bug
6 years ago
wangning c1518c0d78 update
6 years ago
wangning f40893bc1b Merge branch 'hotfix'
6 years ago
wangning 1e504da6c5 Merge branch 'hotfix' into develop
6 years ago
wangning 3bff0e783f update
6 years ago
wangning 068904c74b Merge branch 'master' of https://git.royalpay.com.au/git/royalv2.manage
6 years ago
wangning 215a9afb68 Merge branch 'hotfix' into develop
6 years ago
wangning ab42149104 rollback mailgun
6 years ago
wangning 51136611b0 update
6 years ago
wangning c743e6a279 app modify cache flush
6 years ago
wangning bd7121c4a0 Merge branch 'develop' of https://git.royalpay.com.au/git/royalv2.manage into develop
6 years ago
wangning 6dd2ad6111 update
6 years ago
yuan 90c59d2b24 fix~
6 years ago
wangning a8d6854670 update
6 years ago
wangning e013b87ec5 update
6 years ago
wangning a7dc9668dc update
6 years ago
wangning d03222cbf5 apply to compliance add condition
6 years ago
wangning 29770d63d8 Merge branch 'develop' of https://git.royalpay.com.au/git/royalv2.manage into develop
6 years ago
wangning a74831988b update
6 years ago
yuan 497815c33c Merge remote-tracking branch 'origin/develop' into develop
6 years ago
yuan 5661a0fd1e fix~
6 years ago
eason f11a3a408b fix bsb number api
6 years ago
yuan 5f88caca01 fix~
6 years ago
yuan b65f8f0a15 增加商户交易额导出功能
6 years ago
wangning 58d1dc0797 udpate
6 years ago
wangning 29ee5e46f7 udpate
6 years ago
wangning cf425c44dc update
6 years ago
wangning ef62dcd62f add log
6 years ago
wangning 88a28d82ae udpate
6 years ago
wangning d47602829e update
6 years ago
wangning c2595dec95 update
6 years ago
wangning f32c5f78e2 Send Verify Mail
6 years ago
wangning 95075381f5 compliance_audit
6 years ago
wangning 8cadcab799 Merge branch 'hotfix' into develop
6 years ago
wangning 57ee6e86bb mailgun list add & remove
6 years ago
wangning a1c3f6d67e Merge branch 'hotfix' into develop
6 years ago
wangning e22617082e update
6 years ago
wangning ea90957965 Merge branch 'hotfix' into develop
6 years ago
wangning 4651e63a0a update
6 years ago
wangning 3b9038eab6 update
6 years ago
wangning dd46237aee Merge branch 'hotfix' into develop
6 years ago
wangning 32d34e4979 fixbug
6 years ago
wangning 1ce6312a50 Merge branch 'hotfix' into develop
6 years ago
wangning eb9595b126 同步删除mailgun
6 years ago
wangning c12dd88236 Merge branch 'hotfix' into develop
6 years ago
wangning b90dc9d489 fixbug
6 years ago
wangning 273ee2def4 Merge branch 'hotfix' into develop
6 years ago
wangning 72454b3a49 fixbug
6 years ago
wangning 7772f971de fixbug
6 years ago
wangning d0ffdafd0c fixbug
6 years ago
wangning 9a226c784e fixbug
6 years ago
wangning 769d28d28b fixbug
6 years ago
wangning e17b2ffbae add log
6 years ago
wangning 60b347d5f1 add log
6 years ago
wangning b22b39cc4e add log
6 years ago
wangning 418ea1dca5 add log
6 years ago
wangning 58a2011053 add log
6 years ago
wangning e47b386e25 Merge branch 'develop' of https://git.royalpay.com.au/git/royalv2.manage into develop
6 years ago
wangning c7bb10d30c add log
6 years ago
yuan 0be9a6548d fix~
6 years ago
yuan ee0b68e8a5 fix~
6 years ago
yuan b7241f6e9e fix~
6 years ago
yuan 20bdd9a5b2 Merge remote-tracking branch 'origin/develop' into develop
6 years ago
yuan 28c714d9c8 fix~
6 years ago
wangning d535f982e4 tmp
6 years ago
yuan 7e2e560e54 增加自主申请查询列表
6 years ago
wangning 9822eff9a8 tmp
6 years ago
wangning 5e870b307a Merge branch 'develop_app' into develop
6 years ago
wangning 84ccd1dd85 Merge branch 'develop' of https://git.royalpay.com.au/git/royalv2.manage into develop
6 years ago
wangning a78fa866c9 Merge branch 'hotfi' into develop
6 years ago
wangning 28d72b83bc bugfix
6 years ago
yuan 69ebfcb07f Merge remote-tracking branch 'origin/develop' into develop
6 years ago
yuan b7e978d8c8 fix~
6 years ago
yixian d783ee0639 Merge remote-tracking branch 'origin/develop' into develop
6 years ago
yixian 8cf06cdfce fix nullpointer error
6 years ago
wangning abc6ba1d7c 测试配置
6 years ago
wangning da4a151e81 update
6 years ago
wangning 24e1c25672 Merge branch 'hotfix' into develop
6 years ago
wangning 347e63152f Merge branch 'hotfix'
6 years ago
wangning 3526941e60 update
6 years ago
wangning 9d41194522 Merge branch 'master' of https://git.royalpay.com.au/git/royalv2.manage
6 years ago
wangning 653776594b Merge branch 'hotfix' into develop
6 years ago
wangning 9fbabffb43 update
6 years ago
eason.qian e8102a27fd fix
6 years ago
eason.qian a0d151d8bd fix 批量修改商户BD
6 years ago
eason.qian e3d90debbb fix nap 订单 用户头像
6 years ago
yuan 6981aa715e Merge remote-tracking branch 'origin/develop' into develop
6 years ago
yuan 23d5d80c14 修改dashboard.html
6 years ago
yuan e9f24a5efb Merge branch 'fix_dashboard_6/1' into develop
6 years ago
yuan 56a6497dbb fix~~
6 years ago
wangning 280588a2f9 rollback
6 years ago
wangning 5e077000de 测试配置
6 years ago
wangning 50afd1207d rollback
6 years ago
wangning c971f2005c 测试配置
6 years ago
wangning 5479061946 Merge branch 'develop' of https://git.royalpay.com.au/git/royalv2.manage into develop
6 years ago
wangning 0bc2a07513 update
6 years ago
yuan 793157403e fix~~
6 years ago
yuan a1b2ff0474 fix~~
6 years ago
wangning 0c5f5cb392 fixbug mail bug
6 years ago
wangning 1399fb38a5 fixbug mail bug
6 years ago
wangning ff5494efc3 rollback
6 years ago
wangning b5e85a0c7c 测试放开
6 years ago
wangning 9ffd3f7643 update
6 years ago
wangning 4956878da7 Merge branch 'hotfix' into develop
6 years ago
wangning a85861aa30 update
6 years ago
wangning 838a835cf1 Merge branch 'hotfix' into develop
6 years ago
wangning b5662ee0df bug fix
6 years ago
wangning c9777087f1 Merge branch 'develop' of https://git.royalpay.com.au/git/royalv2.manage into develop
6 years ago
wangning b4277bfcc5 自助进件费率配置分开
6 years ago
wangning 8ccde3e5a9 tmp
6 years ago
wangning ead3536fab update
6 years ago
yuan ca079894b2 fix~~
6 years ago
wangning 7a55463794 添加修改商户基本信息接口
6 years ago
wangning fe9d052c09 Merge branch 'develop' into develop_app
6 years ago
wangning 0489cbf660 update
6 years ago
wangning 92ab3b61f4 add permission
6 years ago
yuan 9eb09f0ef6 fix~~
6 years ago
wangning 67b311743d fixbug
6 years ago
wangning ef8a137f1e update
6 years ago
yuan f01153e10d fix~~
6 years ago
yuan 50cbf69892 Merge remote-tracking branch 'origin/develop' into develop
6 years ago
yuan c9246bf5f3 fix~~
6 years ago
wangning e286ab5f61 Merge branch 'develop' of https://git.royalpay.com.au/git/royalv2.manage into develop
6 years ago
wangning 995e469569 update
6 years ago
yuan cae8827a21 fix~~
6 years ago
yuan 58d4b60f16 fix~~
6 years ago
wangning 7d18e08d06 Merge branch 'develop' of https://git.royalpay.com.au/git/royalv2.manage into develop
6 years ago
wangning 7a882c68c3 删除多余代码
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 362eb8a3c8 udpate
6 years ago
wangning 11cde27af2 update industry
6 years ago
yuan 4ebf2f25d6 fix~~
6 years ago
yuan db58007ee7 Merge remote-tracking branch 'origin/develop' into develop
6 years ago
yuan 451b6f2a7b fix~~
6 years ago
wangning 4a0b57c76f Merge branch 'develop' of https://git.royalpay.com.au/git/royalv2.manage into develop
6 years ago
yuan e6ac37fd05 fix~~
6 years ago
wangning 6e531b006b update
6 years ago
wangning 192a3ddf83 Merge branch 'develop' of https://git.royalpay.com.au/git/royalv2.manage into develop
6 years ago
wangning 5ac7c7322c 1.add country default value
6 years ago
yuan 4dabd64c45 Merge remote-tracking branch 'origin/develop' into develop
6 years ago
yuan bc971bd8b5 fix~~
6 years ago
wangning 139eade7ee Merge branch 'develop' of https://git.royalpay.com.au/git/royalv2.manage into develop
6 years ago
yuan 40d2e729a1 fix~~
6 years ago
wangning 2a498263b7 update
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
wangning 71d25d675d Merge branch 'develop' of https://git.royalpay.com.au/git/royalv2.manage into develop
6 years ago
wangning 037c8adfa3 Merge branch 'hotfix' into develop
6 years ago
wangning a99828d095 update
6 years ago
yuan 49ad834a79 fix~~
6 years ago
eason.qian 46302d675a Merge remote-tracking branch 'origin/develop' into develop
6 years ago
eason.qian 39e0d81d8a fix
6 years ago
yuan d8bf233bd3 fix~~
6 years ago
eason.qian 4f28d86abd Merge remote-tracking branch 'origin/develop' into develop
6 years ago
eason.qian 4cb89bf3ab fix
6 years ago
wangning 535e43dcb8 update
6 years ago
eason.qian 82353cfe20 fix
6 years ago
yuan 518228fc38 Merge remote-tracking branch 'origin/develop' into develop
6 years ago
yuan 7f69e34750 fix~~
6 years ago
wangning 2b43a58632 Merge branch 'develop' of https://git.royalpay.com.au/git/royalv2.manage into develop
6 years ago
wangning a9bb6143b5 update
6 years ago
yuan 7c4529e382 fix~~
6 years ago
yuan dd228d86c8 Merge remote-tracking branch 'origin/develop' into develop
6 years ago
yuan ba0b61b701 fix~~
6 years ago
wangning 8359b31873 update
6 years ago
wangning a49313d0b7 Merge branch 'develop' of https://git.royalpay.com.au/git/royalv2.manage into develop
6 years ago
wangning 91e340f3c8 update
6 years ago
wangning 99df2c0e9f update
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
wangning a9c50800b0 add file interface
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
wangning fe8f851731 update
6 years ago
wangning b028a0deb1 update
6 years ago
wangning a84406f6c0 update
6 years ago
yuan 18e9865b77 Merge remote-tracking branch 'origin/clientApply' into clientApply
6 years ago
wangning 9059101594 update
6 years ago
wangning e9573f77f7 update
6 years ago
wangning 02903d5055 Merge branch 'clientApply' into develop
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 e5ee89eb15 update
6 years ago
wangning b5f2f1ed29 update
6 years ago
wangning d9a6af58bb update
6 years ago
yuan 2ba51365ec Merge remote-tracking branch 'origin/clientApply' into clientApply
6 years ago
yuan 8131486839 Merge remote-tracking branch 'origin/clientApply' into clientApply
6 years ago
wangning 3429300924 update
6 years ago
wangning 51aa069acd update
6 years ago
wangning 73d07ba731 SettleMent Estimate alipayOnline
6 years ago
wangning 2d8f06c845 update
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 be7727061d update
6 years ago
wangning d51a174b7e update
6 years ago
wangning f502ac2f80 update
6 years ago
eason.qian 9944407894 自助开通合规流程改造
6 years ago
yuan c7a80a9b26 Merge remote-tracking branch 'origin/clientApply' into clientApply
6 years ago
yuan 74a59a1bd3 fix~
6 years ago
wangning c56773120d update
6 years ago
wangning 06a4804543 Merge branch 'clientApply' of https://git.royalpay.com.au/git/royalv2.manage into clientApply
6 years ago
wangning df1e735eff update
6 years ago
yuan 19f0045183 fix~
6 years ago
wangning b4f76e8182 update
6 years ago
wangning 6b83b79512 update
6 years ago
wangning 914525f150 Merge remote-tracking branch 'origin/clientApply' into clientApply
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 2d829fb746 update name
6 years ago
wangning 0108ab9322 update
6 years ago
wangning 1e97502b4b update
6 years ago
wangning 2b414c537d update
6 years ago
wangning f6be2111f2 merge conflict
6 years ago
wangning 5980813f58 update
6 years ago
wangning 25f11e7c3c update
6 years ago
wangning ed6d43b18a add mail status
6 years ago
yuan 2337e30251 fix~
6 years ago
wangning 047ba2b7d7 update url
6 years ago
yuan 0c393ef0bc Merge remote-tracking branch 'origin/clientApply' into clientApply
6 years ago
yuan 00655632b4 fix~
6 years ago
wangning c4f2de599e update
6 years ago
wangning 3bbf73298d merge conflict
6 years ago
wangning 45c8e9248c update
6 years ago
yuan 54f7f8ee9c fix~
6 years ago
yuan 9889521acd fix~
6 years ago
wangning 89d0c7a4ae rollback
6 years ago
wangning 3f03b2aa18 tmp
6 years ago
wangning e9be935d2a update
6 years ago
wangning 9da06355cb Merge branch 'hotfix' into develop
6 years ago
wangning 0cbd63031f update
6 years ago
wangning 82562fb045 tmp
6 years ago
wangning fd74bf0e22 update
6 years ago
yuan 5984216f64 Merge remote-tracking branch 'origin/clientApply' into clientApply
6 years ago
eason.qian 2733a1ea76 fix
6 years ago
wangning 15fe2c59fb add verify mail & SMS code
6 years ago
yuan 9d05f01072 Merge remote-tracking branch 'origin/clientApply' into clientApply
6 years ago
wangning 1842e10bb3 tmp
6 years ago
wangning 543964051b tmp
6 years ago
wangning 48cc6509c0 tmp
6 years ago
wangning 025c3525f2 Merge branch 'hotfix' into develop
6 years ago
wangning 67062c1930 add risk record authority
6 years ago
wangning 09976bbab9 tmp
6 years ago
yuan 3569ec32e9 Merge branch 'merchant_application' into clientApply
6 years ago
yuan de98a7c279 add
6 years ago
wangning 687c8b10e7 Merge branch 'test' into develop
6 years ago
wangning c81e91d1b2 update
6 years ago
eason.qian 0851f793a0 Merge branch 'develop' into clientApply
6 years ago
wangning 11cf6b5819 update
6 years ago
wangning 55375af2ed fix
6 years ago
wangning 4dd95c3cf5 fix
6 years ago
wangning 57b3a77fbd update
6 years ago
wangning f24084254c add log
6 years ago
wangning 32a317c344 update
6 years ago
eason.qian b801aba02d mailgun
6 years ago
eason.qian 23258a78bb Merge branch 'mailgun' into develop
6 years ago
eason.qian a4fb42ef4b fix
6 years ago
wangning 25d54b340b Merge branch 'mailGunTest' into test
6 years ago
wangning 6ab808a45f update
6 years ago
wangning 128eddeb28 update
6 years ago
wangning c2d64ca19a qrcode
6 years ago
wangning da05f901ca qrcode
6 years ago
Tayl0r 807166f6fc log
6 years ago
wangning 5661406e27 update
6 years ago
wangning 63a22cd783 update
6 years ago
wangning 8f38a3f2c4 fix customer_order statics
6 years ago
eason.qian 83f2de9c93 Merge remote-tracking branch 'origin/develop' into develop
6 years ago
eason.qian 85bf0c378d fix
6 years ago
wangning b569b5fc5d update
6 years ago
wangning ad6243d386 Merge branch 'develop' of https://git.royalpay.com.au/git/royalv2.manage into develop
6 years ago
wangning b0050d60f1 merge conflict
6 years ago
wangning 9540f99d86 modify task method name
6 years ago
Tayl0r 126b6b59bb Merge remote-tracking branch 'origin/develop' into develop
6 years ago
Tayl0r 2dfb1a052a [Y] 签名增加验证节点ip
6 years ago
yuan 4c3360f9e5 fix html
6 years ago
wangning 58b12d66b3 modify mail gun properties
6 years ago
wangning 11e7bd5e13 Merge branch 'develop' of https://git.royalpay.com.au/git/royalv2.manage into develop
6 years ago
wangning 54ae201cde modify redpack send rule
6 years ago
yuan 963c7951de 修改红包返现页面
6 years ago
wangning f7774cf14f Merge branch 'develop' of https://git.royalpay.com.au/git/royalv2.manage into develop
6 years ago
wangning 9acc33a509 fixbug daily_transactions
6 years ago
yixian e386d9cfe8 Merge branch 'hotfix20180517compileerr' into develop
6 years ago
yixian d95e848045 compile error
6 years ago
yixian 3034bf99fd task edit for docker
6 years ago
wangning 601e678e09 update
6 years ago
wangning 9a51b08d41 change microapp to MiniProgram
6 years ago
wangning 7c0da6d5cf update
6 years ago
wangning 44087dd5d1 update
6 years ago
wangning 2b2b5563d4 update
6 years ago
yuan 68339f4027 订单查询增加gateway选项
6 years ago
wangning f32e2205fb update
6 years ago
yuan 139711f662 fix html
6 years ago
wangning b34e6b8f3c update
6 years ago
yuan 8f88d8084b fix bug
6 years ago
wangning 9126519dcf merge
6 years ago
wangning adbfe6ca31 Merge branch 'mailgun' of https://git.royalpay.com.au/git/royalv2.manage into mailgun
6 years ago
yuan cfa1f5f6e0 add~
6 years ago
wangning 74b685beb8 update
6 years ago
wangning 1363061693 update
6 years ago
wangning a46cfe5444 modify mail send
6 years ago
wangning 7e21301e7d update
6 years ago
wangning f9f58012e4 add mailgun interface
6 years ago
eason.qian 99487530a3 fix
6 years ago
wangning 9a1844fa13 update
6 years ago
wangning e5ef17bd7e update
6 years ago
wangning 8512a9d0a9 add mailgun notify
6 years ago
wangning f7f5a925dc tmp
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 6fc0474464 Merge branch 'hotfix' into develop
6 years ago
wangning e63f08ba19 fix bug
6 years ago
wangning 9cf07ff142 Merge branch 'hotfix' into develop
6 years ago
wangning 0bdb01445b roll back
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
wangning ddee63590f alsjd
6 years ago
yuan bce5a86aa4 fix bug~
6 years ago
eason.qian 7f5dd867c3 fix
6 years ago
yuan c0fffb94e3 fix html
6 years ago
yuan 2f2d21f03e fix~
6 years ago
yuan f3f6af80f6 商户端增商户订单ID生成二维码功能
6 years ago
wangning f592cb4a7a Merge branch 'develop' of https://git.royalpay.com.au/git/royalv2.manage into develop
6 years ago
wangning 665021e05d bug fix
6 years ago
yuan 631f705000 dashboard交易额增加缓存
6 years ago
yuan 015e1e388d 风控记录增加筛选
6 years ago
eason.qian c0bd0d4d6c fix
6 years ago
wangning 0fe89dbde2 refuse apply
6 years ago
wangning 59c1dfac8b update customer impression work time
6 years ago
wangning 8f6f81d00a Merge branch 'master' of https://git.royalpay.com.au/git/royalv2.manage
6 years ago
wangning 579a1cc472 fixbug
6 years ago
eason.qian 172cea098b Merge remote-tracking branch 'origin/master'
6 years ago
eason.qian 4d412afb9f Merge branch 'hotfix'
6 years ago
eason.qian 38261ec614 fix
6 years ago
wangning 17aaa8e2db update
7 years ago
wangning 4f4f1bd1a1 update
7 years ago
wangning 2bc908c7d9 update
7 years ago
wangning 41723ba17e update
7 years ago
wangning c2200d1f62 bd_id
7 years ago
wangning 9ac5efbcc1 update
7 years ago
wangning 8bbba61d9d update
7 years ago
wangning 87e1d6eb18 Merge branch 'master' of https://git.royalpay.com.au/git/royalv2.manage
7 years ago
wangning 48e76b7d33 update
7 years ago
eason.qian 591549acb6 fix
7 years ago
wangning d05cea8b1c update mongo pwd
7 years ago
wangning 8ac04b8d80 update
7 years ago
wangning 992a696e25 update
7 years ago
wangning 6616a10add Merge branch 'develop' of https://git.royalpay.com.au/git/royalv2.manage into develop
7 years ago
wangning cdd9f0b700 update mongo db name
7 years ago
wangning 83800853f3 update
7 years ago
wangning 96d18a6171 update
7 years ago
wangning 3f4b456e87 update
7 years ago
wangning fdbf906996 update
7 years ago
wangning 4c5ffc129f Merge branch 'develop' into develop_client_config
7 years ago
yuan ae8d4a66ba fix html~
7 years ago
wangning fe26434e11 update
7 years ago
wangning ba8ec57049 update
7 years ago
wangning ca23d42860 merge conflicts
7 years ago
eason.qian 9b1f6fa399 Merge remote-tracking branch 'origin/develop' into develop
7 years ago
eason.qian 969e3ac2ee fix
7 years ago
wangning 37902465f6 merge conflict
7 years ago
eason.qian 46fe387a69 fix
7 years ago
wangning f1ea0af02f update
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
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 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
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
eason.qian 86e1b7b03c fix
7 years ago
wangning 9b6b36685a add risk interface
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 227b712f8f fix
7 years ago
eason.qian 5f9b173fe6 add ip location
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 d37037f2ea 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
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
yuan 8fc003f87e fix`
7 years ago
yuan 9a10445398 Merge remote-tracking branch 'origin/develop' into develop
7 years ago
yuan d6de760fe0 fix bug
7 years ago
eason.qian df189f70ba fix
7 years ago
yuan 6c33158e66 fix bug
7 years ago
yuan cedbbfe97e fix~
7 years ago
yuan ddb1ebd101 Merge branch 'settlement' into develop
7 years ago
yuan 005418d1eb fix~
7 years ago
wangning 3dfbfc9647 update
7 years ago
wangning 0d7d2ade26 update
7 years ago
yuan 010586e3fd add~
7 years ago
yuan 071c05905a fix~
7 years ago
yuan ae8ea53870 商户管理增加suburb筛选
7 years ago
wangning 997867d224 update
7 years ago
wangning 48e5624cb2 merge conflict
7 years ago
wangning eacb8d89de update
7 years ago
eason.qian 3f4a2cf9a6 fix partner invoice + settlement log tip
7 years ago
wangning f4345b7096 update
7 years ago
wangning 2936b1072e order bind qrcode version
7 years ago
wangning c221156029 add qrcode log
7 years ago
wangning 2f1abf902a add mongo
7 years ago
eason.qian 470f5d191e fix add app invoice
7 years ago
wangning 518b0639b4 Merge branch 'update' into develop
7 years ago
wangning fce674a87b update
7 years ago
yuan 873ec92e6c fix~
7 years ago
yuan e00d2bf155 fix ~
7 years ago
yixian 40a0078132 Merge remote-tracking branch 'origin/develop' into develop
7 years ago
yixian e2455be41c ABA File Modify
7 years ago
wangning 6931dcd1de Merge branch 'develop' of https://git.royalpay.com.au/git/royalv2.manage into develop
7 years ago
wangning e0417057b5 copy switch surcharge interface
7 years ago
yuan 1c8cb8714e 商户管理增加merchangt pay gst开关选项，fix bug
7 years ago
yuan ceafd8b858 Merge remote-tracking branch 'origin/develop' into develop
7 years ago
yuan 312193b298 商户端增加partner_invoice.html
7 years ago
eason.qian 49a9a2a5c1 fix
7 years ago
wangning 95e0d8c2cb Merge branch 'update' into develop
7 years ago
wangning 0bc5ec040e update
7 years ago
wangning 39185f20d9 update
7 years ago
wangning c39bee44e6 Merge branch 'master' of https://git.royalpay.com.au/git/royalv2.manage
7 years ago
wangning 264ec82506 Merge branch 'develop' of https://git.royalpay.com.au/git/royalv2.manage into develop
7 years ago
wangning 492a4f3f06 Merge branch 'bugfix' into develop
7 years ago
wangning 2ba62a83f1 bug fix
7 years ago
wangning e7f2bfb302 add app client QRcode
7 years ago
eason.qian 2707c2b195 fix
7 years ago
wangning 9f428e2bd8 update
7 years ago
eason.qian 8f7125dae6 Merge branch 'develop'
7 years ago
yuan c72612110d fix html
7 years ago
yuan 580ea4ee05 商户管理增加merchant_id筛选
7 years ago
eason.qian e2b3d6c686 fix 最后一步打回
7 years ago
wangning 05d325db47 Merge branch 'develop' into develop_client_config
7 years ago
wangning 3ce990059b update
7 years ago
wangning 318c661057 Merge branch 'develop' into develop_client_config
7 years ago
eason.qian 77738cf8a5 Merge branch 'develop'
7 years ago
eason.qian 7f40f73ad6 fix
7 years ago
wangning 4920ab324b update
7 years ago
wangning ad08428964 update
7 years ago
wangning 498b30c519 update
7 years ago
eason.qian 2b928e930d Merge branch 'develop'
7 years ago
eason.qian 210408268e fix
7 years ago
wangning 391e254402 update
7 years ago
wangning 24f49dfcfc rollback
7 years ago
eason.qian 243de321e1 Merge remote-tracking branch 'origin/develop' into develop
7 years ago
eason.qian ace0dcb970 fix
7 years ago
wangning e68fb40acf update
7 years ago
yuan 8d80e1ff97 Merge remote-tracking branch 'origin/develop' into develop
7 years ago
yuan a288696a61 fix~
7 years ago
eason.qian e3d138c490 fix
7 years ago
eason.qian 62a258ccfb fix
7 years ago
wangning 13f8547d47 update
7 years ago
eason.qian 467b840001 Merge branch 'develop'
7 years ago
eason.qian 8e06058e43 fix
7 years ago
Tayl0r e3ff27b07b [Y] 修改新商户号的测试商户id
7 years ago
Tayl0r dea2d25dc4 [Y] 修改新商户号的测试商户id
7 years ago
wangning e7817f5449 tmp
7 years ago
yuan da999e6c85 Merge remote-tracking branch 'origin/develop' into develop
7 years ago
yuan 2b3343135d Merge remote-tracking branch 'origin/develop' into develop
7 years ago
eason.qian 0f045d65fe fix
7 years ago
yuan 9af1015a1b fix ~
7 years ago
wangning 3a2b7356ca tmp
7 years ago
wangning 72e09ceb55 update
7 years ago
wangning 9e97c10874 Merge branch 'master' of https://git.royalpay.com.au/git/royalv2.manage
7 years ago
wangning 5b8bfad73d bug fix
7 years ago
wangning 6380c5d5b5 update
7 years ago
eason.qian 6ada3a95f7 Merge branch 'new_partner_dashboard' into develop
7 years ago
yuan 7abd5b8a6e Merge remote-tracking branch 'origin/new_partner_dashboard' into new_partner_dashboard
7 years ago
yuan db31a54f52 fix bug
7 years ago
wangning b7ef26926e Merge branch 'clientmodify' into develop_client_config
7 years ago
wangning a3ab6bc849 update
7 years ago
yixian b2dbbcbfce client modify
7 years ago
eason.qian 5793bca24c Merge branch 'new_partner_dashboard' into develop
7 years ago
eason.qian 719c28acef fix
7 years ago
eason.qian 9aa7f66bc3 Merge branch 'new_partner_dashboard' into develop
7 years ago
yuan be4fa9b32c fix bug
7 years ago
eason.qian 08f873e30a Merge branch 'new_partner_dashboard' into develop
7 years ago
wangning 11961dc264 tmp
7 years ago
yuan c7fcb2c867 fix~
7 years ago
wangning 25e2467438 Merge branch 'develop' of https://git.royalpay.com.au/git/royalv2.manage into develop
7 years ago
wangning d930511e61 update
7 years ago
eason.qian df0341f6f6 fix
7 years ago
yuan ce29c7f86f fix bug
7 years ago
yuan e27769b945 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 90b37f3bab 商户查询接口检查
7 years ago
eason.qian 75dd9b3896 fix
7 years ago
wangning 24f2c0bf95 调整查询商户信息接口
7 years ago
wangning 246c6eddd5 Merge branch 'develop' into develop_client_config
7 years ago
wangning 2228a0cc45 bug fix
7 years ago
wangning 53d001a965 update
7 years ago
wangning 5e15731509 Merge branch 'develop' of https://git.royalpay.com.au/git/royalv2.manage into develop
7 years ago
wangning c38d906cea Merge branch 'update' into develop
7 years ago
wangning c687dc2ebe update
7 years ago
yuan 025d24c358 fix bug
7 years ago
eason.qian 1854088159 Merge remote-tracking branch 'origin/develop' into develop
7 years ago
eason.qian 24fab32043 fix total_surcharge add tax_amount
7 years ago
eason.qian dba05af35c fix
7 years ago
wangning c0fc073271 tmp
7 years ago
wangning 74e955bca4 Merge branch 'develop' of https://git.royalpay.com.au/git/royalv2.manage into develop
7 years ago
wangning 0567dc9b0a tmp
7 years ago
wangning a4049f49e9 Merge branch 'update' into develop
7 years ago
wangning ffa553ca06 update
7 years ago
eason.qian f4ff5aa2b2 fix
7 years ago
wangning 2be8962d73 tmp
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
eason.qian cec7be1bfa fix 商户导出transaction pdf report 去除royalpay fee及相关渠道手续费显示
7 years ago
yuan d367f9c615 fix bug
7 years ago
yuan 33b3795a58 fix partner dashboard
7 years ago
wangning caa60f6287 Modify BD Leader prize
7 years ago
yuan fbae009d06 modify html
7 years ago
wangning 0a41d58e77 update
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 86681ed0ca Merge branch 'master' of https://git.royalpay.com.au/git/royalv2.manage
7 years ago
wangning 414c4a783d Merge branch 'develop' of https://git.royalpay.com.au/git/royalv2.manage into develop
7 years ago
wangning a0e2115033 fixbug
7 years ago
yixian c6b7a5d2d4 error processing
7 years ago
eason.qian 921936404b fix
7 years ago
eason.qian 5015d7983b fix
7 years ago
wangning d2ae70876f Merge branch 'master' of https://git.royalpay.com.au/git/royalv2.manage
7 years ago
wangning c8856db17b Merge branch 'develop' of https://git.royalpay.com.au/git/royalv2.manage into develop
7 years ago
wangning a9b249e386 fixbug
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 57655cd643 fix
7 years ago
eason.qian 7e404d685f fix
7 years ago
eason.qian c04d6d93c4 fix
7 years ago
eason.qian b1bb48e5fe fix
7 years ago
eason.qian e19804786b Merge branch 'develop'
7 years ago
eason.qian c29235de78 fix
7 years ago
eason.qian 86bc87c381 fix
7 years ago
eason.qian 90c13fc328 fix
7 years ago
wangning 7324b3a099 Merge branch 'update' into develop
7 years ago
wangning 50eb0d8180 add contract analysis & pageable
7 years ago
wangning 0d2712b647 Merge branch 'update' into develop
7 years ago
wangning 9467e91794 update
7 years ago
wangning d634cdde53 Merge branch 'update' into develop
7 years ago
wangning e503e7dca1 update
7 years ago
wangning 04c76cf4df Merge branch 'develop' of https://git.royalpay.com.au/git/royalv2.manage into develop
7 years ago
wangning 258af077c9 1 update api doc
7 years ago
yixian ccd94f8e8d logback logger
7 years ago
eason.qian f31b05ca74 fix
7 years ago
eason.qian c1302de12a fix
7 years ago
wangning 3c1c6e7219 Merge branch 'develop' of https://git.royalpay.com.au/git/royalv2.manage into develop
7 years ago
wangning 41b993e995 update
7 years ago
wangning f86c8c0b98 update
7 years ago
wangning effe1d79f6 update
7 years ago
wangning 3b53be6de3 update contract
7 years ago
eason.qian 5052f5f7d6 Merge remote-tracking branch 'origin/develop' into develop
7 years ago
eason.qian 9cc683fa30 fix
7 years ago
wangning 2d32485efe update
7 years ago
wangning 946b773031 update
7 years ago
wangning 9bf6dd5a27 Merge branch 'master_doc' into develop
7 years ago
wangning 7dc7748f7e update contract
7 years ago
wangning 68c896aae2 update contract Abnormal process
7 years ago
eason.qian d09e38203f fix
7 years ago
eason.qian 481fa42eb5 fix
7 years ago
eason.qian a02ba16a8c Merge branch 'master' into develop
7 years ago
wangning aa424f3a88 Merge branch 'master' of https://git.royalpay.com.au/git/royalv2.manage
7 years ago
wangning 85b51943d4 Merge branch 'develop' of https://git.royalpay.com.au/git/royalv2.manage into develop
7 years ago
wangning 376bf1ab1f Merge branch 'hotfix' into develop
7 years ago
wangning 71ea6f9325 app Version
7 years ago
eason.qian 0aebf1bfc3 fix
7 years ago
eason.qian 4b29f6097c fix
7 years ago
eason.qian f8406c81ec fix
7 years ago
eason.qian a3c15325c8 fix
7 years ago
wangning d4287e0bc0 update
7 years ago
eason.qian a510dff3c5 fix
7 years ago
eason.qian 796589c8d6 Merge remote-tracking branch 'origin/develop' into develop
7 years ago
eason.qian ece7015c13 fix
7 years ago
wangning ea8b3049dc Merge branch 'develop' of https://git.royalpay.com.au/git/royalv2.manage into develop
7 years ago
wangning dc5651cdee update
7 years ago
eason.qian e6e4ced9a0 fix
7 years ago
eason.qian c8ffdbdf73 fix
7 years ago
wangning 45ae8c44ef update
7 years ago
wangning 2a7d2b065e Merge branch 'master' of https://git.royalpay.com.au/git/royalv2.manage
7 years ago
wangning 5f4a59ecde hotfix
7 years ago
eason.qian 6bf0c95e29 fix
7 years ago
wangning 39f1cf3b4d Merge branch 'develop' of https://git.royalpay.com.au/git/royalv2.manage into develop
7 years ago
wangning c531ce911a update
7 years ago
yuan 3d7bddfc92 modify html
7 years ago
yuan 75bdedc6f9 Merge remote-tracking branch 'origin/develop' into develop
7 years ago
yuan df901c8745 fix bug
7 years ago
wangning abf23053d7 fixbug
7 years ago
yixian be462ec53d Merge branch 'hotfix20180322manualsettle' into develop
7 years ago
yixian c846ce2451 Merge branch 'hotfix20180322manualsettle'
7 years ago
yixian 5db4a09b92 manual settle
7 years ago
wangning 0997bf3cb0 Merge branch 'develop' of https://git.royalpay.com.au/git/royalv2.manage into develop
7 years ago
wangning 26e7eee4af update aggregate QR board template
7 years ago
eason.qian f0ade8c924 fix
7 years ago
eason.qian 8ccbbe6e61 fix
7 years ago
yuan 8f363f5c07 增加查看mondelay活动记录表
7 years ago
wangning 332a2e6884 Merge branch 'develop' of https://git.royalpay.com.au/git/royalv2.manage into develop
7 years ago
eason.qian df4c8f90d0 fix
7 years ago
wangning f26f218a18 Merge branch 'notice' into develop
7 years ago
wangning 69708125bf Merge branch 'develop' of https://git.royalpay.com.au/git/royalv2.manage into develop
7 years ago
wangning 0ec7bc27c0 update
7 years ago
eason.qian 187298aad8 fix
7 years ago
wangning 1d0100a4c9 update
7 years ago