6116 Commits (master)
 

Author SHA1 Message Date
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 548efd07fd Merge branch 'update' into develop
7 years ago
wangning d5acfc2bbd remove unnecessary code
7 years ago
eason.qian b0ca17b063 orderDetail add tax_amount
7 years ago
wangning 15f8023802 Merge branch 'master_hotfix' into develop
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 eeef7df77c Merge branch 'develop' of https://git.royalpay.com.au/git/royalv2.manage into develop
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