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

2865 Commits (7ad3c813a003a5bed3526046de85b7d38ae0b2cd)

Author SHA1 Message Date
kira d327dce76c update
6 years ago
kira 8f9954f2ee Merge branch 'develop'
6 years ago
yixian 7f8b16cd29 Merge remote-tracking branch 'origin/master'
6 years ago
yixian 4398264977 image
6 years ago
yixian aa1b7ae21f Merge remote-tracking branch 'origin/develop' into develop
6 years ago
yixian f3bfd8d0ec img
6 years ago
taylor.dang 92dd21c447 fix
6 years ago
taylor.dang 90b71373d6 fix
6 years ago
taylor.dang 977849df93 fix
6 years ago
taylor.dang 45fd38b071 fix
6 years ago
yangkai f826867191 缩小抽奖奖励弹窗
6 years ago
luoyang 1a4d406f03 add 65%
6 years ago
luoyang 086873f98a add 55%
6 years ago
yangkai ec30db765b app图标cmsHost修改
6 years ago
yangkai 0b70366c7e 添加app图标管理功能
6 years ago
luoyang 6cd99c841c fix merchant
6 years ago
luoyang de55f0b10c fix merchant
6 years ago
luoyang 48247667ef add 40%
6 years ago
kira 94c971baeb Merge branch 'develop' of https://pms.globalfreepay.com/source/royalpay.manage into develop
6 years ago
kira 6a368f7b65 add customerId
6 years ago
luoyang 6929fa2ebb fix rpay clearing html
6 years ago
luoyang aea70ff828 fix rpay clearing html
6 years ago
luoyang 8667dbee0e fix rpay clearing html
6 years ago
kira d215a7fa8a fix
6 years ago
kira 2f0816573f Merge branch 'develop'
6 years ago
luoyang 962fb6c192 fix rpay merchant Id displayname
6 years ago
luoyang 7ba97fe686 fix properties +rpay
6 years ago
luoyang 8c5e51982d add 10%
6 years ago
taylor.dang 5880537788 Merge remote-tracking branch 'origin/develop' into develop
6 years ago
taylor.dang ea3ba4a5e0 fix
6 years ago
kira ce3e896e89 add rpay merchant
6 years ago
kira 98332d95a5 Merge remote-tracking branch 'origin/develop' into develop
6 years ago
kira 09755b167c modify
6 years ago
luoyang 49548f0137 add 5%
6 years ago
taylor.dang ee0854002e [Y] 商户地理位置定时任务
6 years ago
taylor.dang 48c347a55a [Y] 初始化商户地理位置信息
6 years ago
taylor.dang 2ebe5a2eb7 [Y] 初始化商户地理位置信息
6 years ago
kira 10a0a6f0ce add rpay
6 years ago
kira 43ab6507d6 tmp
6 years ago
kira 4f73be6d88 Merge remote-tracking branch 'origin/develop_rpay' into develop_rpay
6 years ago
kira deebb88a2c update
6 years ago
taylor.dang da29d53dc9 [Y] 新增恢复商户功能
6 years ago
luoyang 4d1e4b3aa1 update revert partner
6 years ago
luoyang 1987cc09f8 update merchant
6 years ago
kira d416b2265f tmp
6 years ago
yixian 2a6cbe1b69 Merge remote-tracking branch 'origin/develop' into develop
6 years ago
yixian b70b34f55f Merge branch 'hotfix-mailpassword' into develop
6 years ago
yixian 25fbddacd9 Merge remote-tracking branch 'origin/master'
6 years ago
yixian 61dc277d62 settlement mail password source
6 years ago
luoyang 8eb861edf3 update rpay html
6 years ago
taylor.dang 137d1cf71e [Y] 红包发送历史关联
6 years ago
kira dd6392c625 update
6 years ago
kira 00775570b9 Merge remote-tracking branch 'origin/develop_rpay' into develop_rpay
6 years ago
luoyang 7ec5f96087 rollback
6 years ago
kira ebf61c187f add rpay
6 years ago
hellolujian aadf58d211 [fix]红包关联globalpay_openid
6 years ago
yixian c0ec8defea ATO Report,
6 years ago
taylor.dang d23de1a885 fix
6 years ago
taylor.dang 3e4085bbf4 mybatis 延迟加载启动
6 years ago
taylor.dang b72cba1a1d mybatis 延迟加载启动
6 years ago
kira bb4d1f9209 Revert "add rpoy+"
6 years ago
luoyang 175cfdd6a0 Merge remote-tracking branch 'origin/develop' into develop
6 years ago
luoyang 354985e242 rollback
6 years ago
luoyang 94aa36f657 add rpoy+
6 years ago
taylor.dang a7b53e63bf fix bugs
6 years ago
taylor.dang aa409635e8 fix
6 years ago
taylor.dang 23249eea35 红包活动
6 years ago
taylor.dang 08ec9840c5 红包活动
6 years ago
yangkai 4993c7bff0 支付完成弹窗修改
6 years ago
taylor.dang c8bdb1dd10 fix
6 years ago
yangkai 584fb887c8 Merge remote-tracking branch 'origin/develop' into develop
6 years ago
yangkai 0cdbe2add4 支付后弹出抽奖跳转弹窗
6 years ago
luoyang 49cf2a4b9b fix risk
6 years ago
luoyang f509f81377 fix risk
6 years ago
yangkai 232c19af7b update
6 years ago
yangkai 02d2e6fd91 Merge remote-tracking branch 'origin/develop' into develop
6 years ago
yangkai 1f976b3450 只允许pine商户参与支付抽奖活动
6 years ago
kira d6c7705e7e update
6 years ago
kira d0dcce073d Merge branch 'develop' of https://pms.globalfreepay.com/source/royalpay.manage into develop
6 years ago
kira 7d7931ceff update
6 years ago
yangkai fa225a873b Merge remote-tracking branch 'origin/develop' into develop
6 years ago
yangkai 8bf48d053e 支付完成后添加抽奖次数
6 years ago
luoyang d8b8a1bc81 fix risk
6 years ago
kira e41a373fc8 tmp
6 years ago
kira 4afa869493 update
6 years ago
kira 9148766cc5 Merge branch 'develop' of https://pms.globalfreepay.com/source/royalpay.manage into develop
6 years ago
kira d85f1c80df remove alert
6 years ago
kira 89cbea2602 update
6 years ago
luoyang eddcef50db fix risk
6 years ago
luoyang 7157b674f6 Merge remote-tracking branch 'origin/develop' into develop
6 years ago
luoyang 25bd733528 add act 10-31
6 years ago
kira 999df149c0 fixbug parent client invalid
6 years ago
kira 9ba1500808 update
6 years ago
kira 32aad0f13c update
6 years ago
kira 6bf31521bf Merge branch 'develop' of https://pms.globalfreepay.com/source/royalpay.manage into develop
6 years ago
kira 14e130316e update
6 years ago
luoyang 1af0a9890e add cms reference
6 years ago
luoyang 823fe881a8 fix asd
6 years ago
luoyang 01dcc58ccb fix asd
6 years ago
luoyang 9d05bcd948 fix asd
6 years ago
luoyang 94c1d06497 fix asd
6 years ago
luoyang efd2185622 add asd
6 years ago
kira 39a6658b15 app style
6 years ago
luoyang 000a66a10b fix clickcopy
6 years ago
luoyang 6081636870 add hf_test show 3
6 years ago
yangkai 5c6125c14a bd开放修改Short Name、Business Name权限
6 years ago
luoyang 5166240edf add clearing_estimate : hf
6 years ago
taylor.dang 348bcdf8dc [y]修复禁用商户提醒 & 黑名单商户查询
6 years ago
yixian 2b6f6b88e1 Merge remote-tracking branch 'origin/develop' into develop
6 years ago
yixian 8321cfb724 ATO Report,
6 years ago
luoyang b1946bc759 fix partnerInfo
6 years ago
luoyang 384475da74 add partnerInfo - copy icon
6 years ago
kira 207bb0f980 Merge branch 'develop' of https://pms.globalfreepay.com/source/royalpay.manage into develop
6 years ago
kira 7dedb7aaf5 Merge branch 'hotfix' into develop
6 years ago
kira 24b286198c update
6 years ago
taylor.dang 01d5c6129d log
6 years ago
kira 6c88a7ce0a Merge branch 'develop' of https://pms.globalfreepay.com/source/royalpay.manage into develop
6 years ago
kira b4f595c34c add settle mail
6 years ago
luoyang 0679f626ce fix clearing
6 years ago
luoyang 0670a41ee9 fix clearing
6 years ago
kira dd2d72e177 update hf industry
6 years ago
kira de4aee60ed update hf industry
6 years ago
kira 7a0bfcab9a test HF
6 years ago
luoyang b10b343679 fix clearing
6 years ago
taylor.dang c6f214559d 支付宝进件信息
6 years ago
kira e2b9855082 add css
6 years ago
yangkai 9e6affb143 Merge remote-tracking branch 'origin/develop' into develop
6 years ago
yangkai fc22178c03 邮件模板添加货币类型
6 years ago
luoyang 6d8e22c8ca fix hf
6 years ago
luoyang e4a92a209b fix hf
6 years ago
luoyang ca9dca7abc fix hf
6 years ago
luoyang f14c1bda2e Merge remote-tracking branch 'origin/develop' into develop
6 years ago
luoyang 71eeb42bb2 fix hf
6 years ago
kira 555561291e update
6 years ago
yangkai 400a1cb38d update
6 years ago
yangkai cc6d0ed83d 携程优惠券记录筛选
6 years ago
yangkai ad3f353e49 update:汇付支付邮件提醒
6 years ago
hellolujian ca0d44e9f3 [fix]新增组织state选项添加其他
6 years ago
hellolujian c7db75ebff Merge remote-tracking branch 'origin/develop' into develop
6 years ago
hellolujian ca9fa4b2dd [fix]新增组织state选项添加其他
6 years ago
yangkai af2ec66f48 update
6 years ago
luoyang 4d3bd00ea4 fix hf qrcode
6 years ago
kira be79766deb update
6 years ago
luoyang 6bd68974e0 add Hf shortURL update
6 years ago
yixian 615b9ddda0 Merge remote-tracking branch 'origin/develop' into develop
6 years ago
yixian 7f730dfe75 修改触发模式
6 years ago
luoyang a4a16fbaba add Hf shortURL update
6 years ago
yangkai bd5b1541af 测试账户权限调整
6 years ago
luoyang 839033b7f7 add partner HF Qrocde
6 years ago
luoyang cda8c017ad add HF Qrocde & change HF shortURL
6 years ago
yangkai 3bfb19535f Ctrip卡券记录查询修改
6 years ago
kira 2a688ae378 update
6 years ago
yangkai a1a54931a3 Ctrip卡券记录接口优化
6 years ago
yangkai d251b38bcc Merge remote-tracking branch 'origin/develop' into develop
6 years ago
yangkai 28eab9a41a 汇付支付完成邮件提醒
6 years ago
luoyang dd23545bae fix hf_gateway.js add banklist && productlist
6 years ago
yangkai 495bf22196 1.新增卡券记录接口
6 years ago
kira dc103d5fd2 update
6 years ago
luoyang 2b43ab4e2e Merge remote-tracking branch 'origin/develop' into develop
6 years ago
luoyang cbe23f9012 fix hf_gateway.js add #bankCard-li hide
6 years ago
james.zhao 723f211a9c Merge remote-tracking branch 'origin/develop' into develop
6 years ago
james.zhao b13a1fc4fe update
6 years ago
luoyang 54ab08e585 fix hf_gateway.js add #bankCard-li hide
6 years ago
luoyang e5578f539c fix hf_gateway.js add #bankCard-li hide
6 years ago
kira 7cd1310384 Merge branch 'develop' of https://pms.globalfreepay.com/source/royalpay.manage into develop
6 years ago
kira 00270cdbd5 update
6 years ago
james.zhao 8c8637a5dc fix
6 years ago
luoyang 2d7cc142c0 fix hf_gateway.js add #bankCard-li hide
6 years ago
kira cdba32148d add customer payment info
6 years ago
kira 076872abba Merge branch 'develop' of https://pms.globalfreepay.com/source/royalpay.manage into develop
6 years ago
kira 2683da65ca wechat check add payment info
6 years ago
taylor.dang a2c55a6339 [Y] 订单支付状态检查
6 years ago
kira d1ccf17b1f update
6 years ago
kira c1de98a283 tmp
6 years ago
kira 9c71e15dad Merge branch 'develop' of https://pms.globalfreepay.com/source/royalpay.manage into develop
6 years ago
kira 5117274fab hf pay page
6 years ago
luoyang 0a1327d926 add listen customerPaymentInfo
6 years ago
yangkai 0c0f9f19df Merge remote-tracking branch 'origin/develop' into develop
6 years ago
yangkai f689953479 修改settle_hour bug
6 years ago
luoyang 1812038645 fix clearing_detail
6 years ago
luoyang 03274a4ee0 fix clearing_detail
6 years ago
yangkai 6929b209fa 用户支付信息录入代码优化
6 years ago
yangkai 90e17cc5b8 1.商品库改造
6 years ago
taylor.dang 0b666f80c2 fix bugs
6 years ago
taylor.dang 155184dcf4 fix
6 years ago
taylor.dang d6f739cc63 fix
6 years ago
taylor.dang 7796b95c2e fix
6 years ago
taylor.dang 8bcede71bc fix
6 years ago
luoyang 6acf488ce6 add hf clearingAmount select
6 years ago
hellolujian 91a89dcc51 [fix]商户号管理页面优化
6 years ago
james.zhao 0fe6d492f4 update
6 years ago
james.zhao 0e21ee5ae3 Merge remote-tracking branch 'origin/develop' into develop
6 years ago
james.zhao 7c7ae527c5 禁用商户开放查看
6 years ago
kira d22f211dc1 Merge branch 'develop' of https://pms.globalfreepay.com/source/royalpay.manage into develop
6 years ago
kira c0228420c9 Merge branch 'hotfix' into develop
6 years ago
kira 3113068859 fixbug parent client invalid
6 years ago
yangkai 944e89f3e9 文件上传超过规定大小，提示报错信息
6 years ago
hellolujian 16d881bca1 [fix]商户号管理页面优化
6 years ago
hellolujian e26849f36b [fix]商户号管理页面优化
6 years ago
hellolujian 51402da218 [fix]商户号管理页面优化
6 years ago
taylor.dang 1ee911e4c2 Settle Hour Config
6 years ago
kira 790ca43758 Merge branch 'hotfix' into develop
6 years ago
kira 23af0f0a27 update
6 years ago
kira 8562993670 add log
6 years ago
kira a91fac2c21 update
6 years ago
kira 3482de66c7 init client permission
6 years ago
kira 2eeb320dc3 init client permission
6 years ago
kira 1dd8dcd8f6 fixbug
6 years ago
taylor.dang 1eafeb7a98 [Y] 自助申请商户分配NAP商户号
6 years ago
kira db42e22648 Merge branch 'hotfix' into develop
6 years ago
kira d53c129f8d update
6 years ago
kira bd1ac80352 Merge branch 'hotfix' into develop
6 years ago
kira 1dd2179e25 update
6 years ago
kira 995e292cfc Merge branch 'hotfix' into develop
6 years ago
kira f31fe586b8 update
6 years ago
kira 23347b58cd Merge branch 'develop' of https://pms.globalfreepay.com/source/royalpay.manage into develop
6 years ago
yangkai ecd7c2a230 Risky Merchants优化
6 years ago
kira 9ea1dabc33 Merge branch 'develop_partnerTA' into develop
6 years ago
kira 7da2f2ae24 update
6 years ago
yixian be0e8ff40d aba file bug fix
6 years ago
yixian 55eb47b8f7 fix clearing date display
6 years ago
yixian f0616d9323 Merge remote-tracking branch 'origin/master'
6 years ago
yixian d6589d2917 fix clearing date display
6 years ago
taylor.dang fb9d6da733 [Y] 通用商户号功能优化
6 years ago
yixian 4523d77eee Merge remote-tracking branch 'origin/master'
6 years ago
yixian c23689c578 settle date display
6 years ago
yangkai e2b56501ab 商户号管理功能优化
6 years ago
taylor.dang 4a78ddac9a 新增微信不合规行业
6 years ago
yangkai 5225ea537f 不合规关键字修改
6 years ago
taylor.dang 0e58f61eb6 [Y] 新增微信不合规提醒 & dashboard 修复
6 years ago
taylor.dang e0a084b01e fix hf css
6 years ago
kira c32c4f5832 Merge branch 'hotfix' into develop
6 years ago
kira 6a4445df30 update
6 years ago
kira cdd589163e Merge branch 'develop' of https://pms.globalfreepay.com/source/royalpay.manage into develop
6 years ago
kira 43c020d4e3 Merge branch 'hotfix' into develop
6 years ago
kira 43e849d879 update
6 years ago
yixian ff8b8e00e2 Merge branch 'hotfix_settlemail' into develop
6 years ago
yangkai 9be4dfec85 Merge branch 'develop_test' into develop
6 years ago
yangkai 39787b7416 1.非合规行业检查
6 years ago
yixian bb4d16bdba settlement mail content
6 years ago
yixian 829a05a328 settlement mail content
6 years ago
yixian ac75df6ead apply interceptor
6 years ago
taylor.dang 40f3e9368a [Y] 风控商户检测
6 years ago
taylor.dang 9b5a21b937 fix
6 years ago
kira 4639d1b530 Merge branch 'master' of https://pms.globalfreepay.com/source/royalpay.manage
6 years ago
kira 09607c104d Merge branch 'develop' of https://pms.globalfreepay.com/source/royalpay.manage into develop
6 years ago
kira 74b0bbce8d Merge branch 'hotfix_hfSettle' into develop
6 years ago
kira 37256a6f15 Merge branch 'hotfix_hfSettle'
6 years ago
taylor.dang ea7846eb38 [Y] fix
6 years ago
taylor.dang 9f45114d96 [Y] 风控商户检测
6 years ago
taylor.dang b78c2c9f09 fix risk
6 years ago
yangkai d6a2853a4d 添加is_valid条件
6 years ago
taylor.dang e430d7804d fix dashboard今日数据
6 years ago
yangkai 5c55b61fb2 控制台数据显示修复
6 years ago
kira 6de18d4324 update
6 years ago
taylor.dang fd4cd788d9 compare
6 years ago
kira 74835ee47d hf settle
6 years ago
kira 74e059180d hf settle
6 years ago
yangkai 63856ad85b 交易商户数量变化bug修复
6 years ago
kira 34dcda4ec1 Merge branch 'hotfix2'
6 years ago
kira 62d887cabd conflict
6 years ago
kira dff33de344 Merge branch 'master' of https://pms.globalfreepay.com/source/royalpay.manage
6 years ago
kira 1ac4662220 conflict
6 years ago
kira 833352386f Merge branch 'hotfix2' into develop
6 years ago
kira 6cd26407b3 update
6 years ago
yangkai f416d0800f 添加验证码验证
6 years ago
yixian ef11bc9de5 apply interceptor
6 years ago
yixian 0816c2a0b9 apply interceptor
6 years ago
kira cb39764a9f Merge branch 'hotfix2' into develop
6 years ago
kira b8d2dcf8c6 update
6 years ago
yixian d8c907e75b Merge remote-tracking branch 'origin/master'
6 years ago
yixian b1e967695e disable city partner
6 years ago
kira 7cc6a73994 Merge branch 'hotfix_postpone' into develop
6 years ago
kira faa2fcd7f8 remove client postpone transaction
6 years ago
kira 0e1ecd239d Merge branch 'hotfix_custom' into develop
6 years ago
kira 4143d12f7b update
6 years ago
kira d5e292ce41 Merge branch 'hotfix_custom' into develop
6 years ago
kira 3fb3c7b7e8 update
6 years ago
kira 6ad7cf9342 Merge branch 'hotfix_custom'
6 years ago
kira 683a7f8d98 Merge branch 'hotfix_custom' into develop
6 years ago
kira 194e8e9e09 rollback
6 years ago
kira 7db3b8875a Merge branch 'develop' of https://pms.globalfreepay.com/source/royalpay.manage into develop
6 years ago
kira dd23152894 Merge branch 'master' of https://pms.globalfreepay.com/source/royalpay.manage
6 years ago
kira 227fdeab34 Merge branch 'hotfix_custom' into develop
6 years ago
kira 5e065b9e61 update
6 years ago
taylor.dang 5fce139e12 fix 账单码查询时间
6 years ago
eason 32c1221486 encourage config params add operator role permission
6 years ago
eason 01d41922c2 Merge remote-tracking branch 'origin/develop' into develop
6 years ago
eason 7cae803907 Merge branch 'hotfix1' into develop
6 years ago
eason 74afa68391 Merge remote-tracking branch 'origin/master'
6 years ago
eason 8b33b85037 fix refund bug "input String"
6 years ago
luoyang14z7 9fca669d45 fix : ali for excel
6 years ago
luoyang14z7 90da2a1c1c fix : ali for excel
6 years ago
kira f21b52a42f Merge branch 'hotfix' into develop
6 years ago
kira f682caf7cb update
6 years ago
kira 8031e87fcf Merge branch 'hotfix_custom' into develop
6 years ago
kira 26eb3f8241 modify Custom
6 years ago
taylor.dang 9b9b430dfa 修改翼支付清算开始日期
6 years ago
kira e51b6af17d Merge branch 'hotfix' into develop
6 years ago
kira bf25295eab update
6 years ago
kira 560cb9a115 Merge branch 'hotfix' into develop
6 years ago
kira afc17eb0fa add ctrip active
6 years ago
kira bbb6d23d36 Merge branch 'hotfix' into develop
6 years ago
kira d1cd353b53 updae
6 years ago
kira facbfecb82 Merge branch 'hotfix' into develop
6 years ago
kira c41d8ad453 update
6 years ago
kira da0e7c5c84 Merge branch 'hotfix' into develop
6 years ago
kira d1be4005f8 add ctrip active
6 years ago
kira 17b3f99880 Merge branch 'hotfix' into develop
6 years ago
kira 5251d2fde3 fixbug
6 years ago
kira b3d8318097 Merge branch 'master' of https://pms.globalfreepay.com/source/royalpay.manage
6 years ago
kira 3ea9756383 Merge branch 'develop' of https://pms.globalfreepay.com/source/royalpay.manage into develop
6 years ago
yuan 2dd9347ab8 Merge branch '8/7' into develop
6 years ago
yuan 1586860791 fix bug
6 years ago
kira 2b017b6896 Merge branch 'hotfix' into develop
6 years ago
kira 8edeaa5152 update
6 years ago
kira d1b3de8b87 add senior partner prize
6 years ago
kira 9ba62f3e33 Merge branch 'hotfix' into develop
6 years ago
kira 2c42ec0ef9 custom add resend
6 years ago
kira 5a218b2090 tmp
6 years ago
yixian 19fa8e9617 custom query
6 years ago
yixian 763a2a9e93 Merge remote-tracking branch 'origin/master'
6 years ago
yixian 1473f89c0c Merge remote-tracking branch 'origin/develop' into develop
6 years ago
yixian b41a08e45a custom query
6 years ago
yuan 9553f8e61d sys_org add state
6 years ago
yuan 89a183e35f Merge branch '8/3' into develop
6 years ago
yuan 07ef3dd582 fix html
6 years ago
kira 90b7c356d1 Merge branch 'master' of https://pms.globalfreepay.com/source/royalpay.manage
6 years ago
kira 762a926d5a Merge branch 'develop' of https://pms.globalfreepay.com/source/royalpay.manage into develop
6 years ago
kira 8bd679bd3d Merge branch 'hotfix' into develop
6 years ago
kira a51df7da06 fixbug
6 years ago
kira bd63e07eb5 Merge branch 'hotfix' into develop
6 years ago
kira 001ea48494 add log
6 years ago
eason 5dfcefeeaa fix prize
6 years ago
eason 630e7940d5 fix prize
6 years ago
eason 876b8cc46e fix
6 years ago
eason 611a4eb646 fix
6 years ago
eason 376687f25b fix bd prize
6 years ago
eason 2627482fba fix
6 years ago
eason 04b3b7665a bd
6 years ago
yuan a9308167d7 fix bug
6 years ago
eason 010b8b63da Merge branch 'hotfix_prize' into develop
6 years ago
eason c8657980cf 优化 BD提成查询
6 years ago
yuan e2f4073169 Merge remote-tracking branch 'origin/develop' into develop
6 years ago
yuan 6058479d25 fix~
6 years ago
kira 96298f95d4 Merge branch 'hotfix' into develop
6 years ago
kira 5e0fa354b2 hide hf exchange rate
6 years ago
kira f461b3bfc4 Merge branch 'develop' of https://pms.globalfreepay.com/source/royalpay.manage into develop
6 years ago
kira e73790d84c Merge branch 'hotfix' into develop
6 years ago
kira 3307ce25b7 fixbug
6 years ago
yuan 8af00b8798 fix bug
6 years ago
kira 248d9d43ee Merge branch 'develop' of https://pms.globalfreepay.com/source/royalpay.manage into develop
6 years ago
kira ea8025ff3d Merge branch 'hotfix' into develop
6 years ago
kira 5a0d041f9c fixbug
6 years ago
yuan 624022a67d fix bug
6 years ago
kira 07d5402ae2 modify sms sender
6 years ago
kira f4c4e7a6e1 Merge branch 'develop' of https://pms.globalfreepay.com/source/royalpay.manage into develop
6 years ago
kira d50b476077 update
6 years ago
kira ab97b9a2ee update
6 years ago
yuan 9e0af4706f fix bug
6 years ago
yuan 35ae7dcc24 自主进件contact_phone加"+61"
6 years ago
kira 125e6f9adc update
6 years ago
kira 5cfea84117 add log
6 years ago
kira e5a7a14d89 fixbug
6 years ago
kira fcb9a0ae6f update
6 years ago
kira 857c4517a8 tmp
6 years ago
kira d742d4b3cf Merge branch 'develop' of https://pms.globalfreepay.com/source/royalpay.manage into develop
6 years ago
kira 5ad8390bc9 update
6 years ago
yuan 777899087c 增加支付宝支付限额
6 years ago
kira 3064b64ecb fixbug
6 years ago
kira 1bc4c2d6d9 update
6 years ago
luoyang14z7 091fb0c830 fix : PartnerPermiss
6 years ago
kira 0c2afb0c81 Merge branch 'develop' of https://pms.globalfreepay.com/source/royalpay.manage into develop
6 years ago
kira a889d06770 update
6 years ago
yixian e11a5b4d92 settlement detail
6 years ago
yuan 1eb2326941 Merge branch '7/30'
6 years ago
yuan 50a5858aa6 Merge branch '7/30' into develop
6 years ago
yuan 918f20359d fix html
6 years ago
eason 57fc6a1ac1 fix wechat sign
6 years ago
yuan 655acd41e3 fix html
6 years ago
yuan b44cca66dd Merge branch '7/30' into develop
6 years ago
yuan 968ce024e7 fix html
6 years ago
kira 7cea42ba44 update
6 years ago
kira 06967690b9 fixbug
6 years ago
kira 568e54467f update
6 years ago
kira 65741a145d update
6 years ago
kira 08710164fe Merge branch 'develop' of https://pms.globalfreepay.com/source/royalpay.manage into develop
6 years ago
kira 21673b0b06 Merge branch 'master' of https://pms.globalfreepay.com/source/royalpay.manage
6 years ago
kira 0bb2c9212a update
6 years ago
eason 6b160eab43 Merge branch 'hotfix' into develop
6 years ago
eason a525310a58 fix
6 years ago
eason ec3fa5efbb Merge branch 'hotfix' into develop
6 years ago
eason 78815a61e9 fix managers management
6 years ago
kira 95082e96a3 update
6 years ago
kira 7993e3f2c8 update
6 years ago
kira a316350c3f update
6 years ago
kira 1629c60a50 update
6 years ago
kira aa70bf4d41 update
6 years ago
kira 747156ec28 update
6 years ago
kira f89ae4b174 update
6 years ago
kira f3bfd0e7db update
6 years ago
kira 698c1086c9 Merge branch 'master' of https://pms.globalfreepay.com/source/royalpay.manage
6 years ago
yuan f3096930e2 fix html
6 years ago
kira 3e823958fa update
6 years ago
kira 1fce5a3dc2 Merge branch 'develop' of https://pms.globalfreepay.com/source/royalpay.manage into develop
6 years ago
kira 77567eaaf9 update
6 years ago
kira 5fc1275493 add custom
6 years ago
yuan f114f89dd2 fix html
6 years ago
kira 981459d0bb update
6 years ago
yuan 886f5d8ef5 Merge branch '7_30' into develop
6 years ago
yuan 07b0241aed fix bug
6 years ago
yuan 24191f31db fix html
6 years ago
eason 61884d34fc Merge branch 'hotfix_manager_service' into develop
6 years ago
eason 2e557f5f15 Merge branch 'master' into hotfix_manager_service
6 years ago
eason 97adc2cf7a fix
6 years ago
eason 2c9c0a1840 Merge branch 'hotfix_manager_service' into develop
6 years ago
eason 61508fbc4a Merge branch 'hotfix_manager_service'
6 years ago
eason 0fec07172c fix service role show
6 years ago
kira bfad3255f4 Merge branch 'hotfix' into develop
6 years ago
kira 98f2a2501e update method name
6 years ago
kira 00e9c8b7da tmp
6 years ago
kira 7ae106869f Merge branch 'develop' of https://pms.globalfreepay.com/source/royalpay.manage into develop
6 years ago
kira d12c2d1c35 refund list add currency
6 years ago
kira 18fc6be9a4 tmp
6 years ago
eason a586964fa5 Merge branch 'develop'
6 years ago
eason f2232c6970 Merge branch 'hot1'
6 years ago
yixian ee1568cb7a Merge remote-tracking branch 'origin/master'
6 years ago
yixian 02687a1263 split bank in download xlsx
6 years ago
eason 93137aae5e Merge remote-tracking branch 'origin/develop' into develop
6 years ago
eason 2c87ffffcb Merge branch 'hot1' into develop
6 years ago
eason 278d362b05 fix new customers
6 years ago
kira 448aa422f0 update
6 years ago
kira ffd560352a update
6 years ago
kira 56ca5abb6c update
6 years ago
kira 95458bc4fc update
6 years ago
kira 63acb207d7 update
6 years ago
kira 921d9b9803 add log
6 years ago
kira 7610d01682 modify openim appkey & secret
6 years ago
kira 46cd2a2bdd update
6 years ago
kira 70d8160871 update
6 years ago
kira 1305007264 update
6 years ago
kira 78a1455350 Merge branch 'develop' of https://pms.globalfreepay.com/source/royalpay.manage into develop
6 years ago
kira e1028366f0 update
6 years ago
eason d1a0ed322b fix google map key
6 years ago
eason fc0e622c2b Merge branch 'hotfix' into develop
6 years ago
eason 19b1425aff fix
6 years ago
kira 58cf4e0fe0 update
6 years ago
eason b9398f2cfa fix google map key
6 years ago
kira 3b6609ad03 update
6 years ago
kira d6a91a1c03 remove log
6 years ago
kira f2632b9c43 update customer service headimg
6 years ago
kira 2991b9ca03 Merge branch 'develop' of https://pms.globalfreepay.com/source/royalpay.manage into develop
6 years ago
kira dab1dbf73e 重构
6 years ago
kira 1a73f48808 重构
6 years ago
eason 3e082165ff Merge remote-tracking branch 'origin/develop' into develop
6 years ago
eason abb86b3c3a Merge branch 'h1' into develop
6 years ago
eason 4f46380949 fix excel remark
6 years ago
kira 5c19193c78 fixbug
6 years ago
kira 016f5f94b1 update
6 years ago
yixian b7736f3318 split bank in download xlsx
6 years ago
kira 4948539479 tmp
6 years ago
kira 47549c0a9d Merge branch 'master' of https://pms.globalfreepay.com/source/royalpay.manage
6 years ago
kira 8b688159f6 Merge branch 'develop' of https://pms.globalfreepay.com/source/royalpay.manage into develop
6 years ago
kira 7589d920a8 Merge branch 'hotfix' into develop
6 years ago
kira ef4752ef1a remove Tommy mail adddress
6 years ago
kira cc623b1a21 update
6 years ago
yixian dd66355486 Merge remote-tracking branch 'origin/develop' into develop
6 years ago
yixian 36ec9d4b6b Merge remote-tracking branch 'origin/master'
6 years ago
yixian 6325331f62 Merge branch 'hotfix_multibank' into develop
6 years ago
yixian de1c415a2d split bank in download xlsx
6 years ago
kira 64fea0ebfe update
6 years ago
kira 2456a8a6bb Merge branch 'develop' of https://pms.globalfreepay.com/source/royalpay.manage into develop
6 years ago
kira 8d3c0d5987 add timer task
6 years ago
kira de7b91a0eb add wx msg
6 years ago
yuan f60eb253a6 Merge branch '7/23' into develop
6 years ago
yuan 8e13ac7452 fix html
6 years ago
yuan 2d3d56bbb1 Merge branch '7/23' into develop
6 years ago
yuan 12a510e30e fix html
6 years ago
kira 791ec028fe udpate
6 years ago
kira bd7459810a update
6 years ago
kira 35ff5437c0 update
6 years ago
kira a0e0827bc4 update
6 years ago
kira 89d1d26a4a update
6 years ago
kira e472c81f5e Merge branch 'develop' of https://pms.globalfreepay.com/source/royalpay.manage into develop
6 years ago
kira 1bab9c4423 add openim application
6 years ago
eason 27f5898810 Merge branch 'hotfix11' into develop
6 years ago
eason 1050937afc fix hf channel show
6 years ago
eason 8ce50ccc36 Merge branch 'fix1' into develop
6 years ago
eason 76f0cec66d fix transaction
6 years ago
kira fde8a601ea add customer servant config
6 years ago
kira c658495834 Merge branch 'master' of https://pms.globalfreepay.com/source/royalpay.manage
6 years ago
kira 92a9e2a1ca Merge branch 'hotfix' into develop
6 years ago
kira a3bf49708c fixbug encourage money
6 years ago
kira cc766351ad add customer service
6 years ago
eason f7c0f165cd fix encourage css
6 years ago
eason 9999f0de43 fix 自定义商户费率
6 years ago
kira 405fdda8d2 Merge branch 'develop' of https://pms.globalfreepay.com/source/royalpay.manage into develop
6 years ago
kira 9e0ec85b81 Merge branch 'refundList' into develop
6 years ago
kira 43abd4d5b1 add pos refund list
6 years ago
kira d0df62162f customer tmp
6 years ago
eason 29cf97ad89 fix encourage
6 years ago
kira 8579b406d3 update
6 years ago
yuan 7d24d1d063 fix bug
6 years ago
yuan 6e2e5f2335 fix html
6 years ago
yuan 5e812e933f fix attention merchants
6 years ago
yuan 20f15d7c64 fix Accounts
6 years ago
kira 87bae39ecc add
6 years ago
kira a6245606a5 tmp
6 years ago
kira 79cfa5085f Merge branch 'master' of https://pms.globalfreepay.com/source/royalpay.manage
6 years ago
kira 6cf637bfec Merge branch 'develop' of https://pms.globalfreepay.com/source/royalpay.manage into develop
6 years ago
kira 10bef3722d Merge branch 'hotfix' into develop
6 years ago
kira caef37d544 Merge branch 'hotfix'
6 years ago
kira 3e2a90f4c6 update
6 years ago
eason b2e5d7dff6 Merge branch 'hotfix2' into develop
6 years ago
eason 5ef0ca18fe fix
6 years ago
kira 53cbcc816f Merge branch 'hotfix' into develop
6 years ago
kira d952777873 update
6 years ago
kira f3e074bb6b Merge branch 'master' of https://pms.globalfreepay.com/source/royalpay.manage
6 years ago
kira 1cceedf15a Merge branch 'develop' of https://pms.globalfreepay.com/source/royalpay.manage into develop
6 years ago
kira 788ea75b1b Merge branch 'hotfix' into develop
6 years ago
kira d444c33349 update
6 years ago
luoyang14z7 5695e312f0 fix : AliForExcel
6 years ago
luoyang14z7 5b5085d410 fix : AliForExcel
6 years ago
kira f060e2fcd3 update
6 years ago
kira bedba86e89 Merge branch 'hotfix2' into develop
6 years ago
kira f52f59f4c6 update
6 years ago
kira e95d595528 update
6 years ago
kira 7c99d32b14 update
6 years ago
kira 5948cdaa9c Merge branch 'hotfix' into develop
6 years ago
kira 1cf58228e6 update
6 years ago
kira 6d2662ded7 tmp
6 years ago
kira 4c97b2cc8a Merge branch 'develop_openim' into develop
6 years ago
kira f4ffe14bfa udpate
6 years ago
kira 58ade45bca Merge branch 'hotfix' into develop
6 years ago
kira 26e0a05699 update encourage money desc
6 years ago
kira 73ad418728 add customer service
6 years ago
kira ecfda6a9ad Merge branch 'hotfix' into develop
6 years ago
kira dce6f0e180 update img
6 years ago
kira 4569c155e0 add default img
6 years ago
kira bb45fc0483 update encourage money head img
6 years ago
eason 3696f360b5 Merge branch 'hotfix1' into develop
6 years ago
eason b4123e7f3f fix encourage
6 years ago
eason 0bf42064df fix encourage
6 years ago
eason f8df5a6079 fix encourage
6 years ago
eason f133e71894 fix encourage
6 years ago
eason dd058ce25a Merge branch 'hotfix1' into develop
6 years ago
eason e7f96bcabb encourage
6 years ago
eason 1f188598a6 encourage
6 years ago
eason a59789984e encourage log
6 years ago
eason cbc766d441 encourage log
6 years ago
kira 0769799a01 Merge branch 'hotfix' into develop
6 years ago
kira 470c234209 update
6 years ago
kira 6e54e0cd66 Merge branch 'hotfix' into develop
6 years ago
kira 21b3c4dd74 update
6 years ago
kira eed179214b Merge branch 'hotfix' into develop
6 years ago
kira de82418d70 encourage money
6 years ago
yuan bf0c4366b7 Merge remote-tracking branch 'origin/develop' into develop
6 years ago
yuan 189e37f2a0 add risk merchants html
6 years ago
yuan 5105bdc6d2 add risk merchants html
6 years ago
luoyang14z7 4f596ec1d3 fix : ActChairty
6 years ago
luoyang14z7 45629cb0de fix : ActChairty
6 years ago
luoyang14z7 9e8f4f0b08 Merge remote-tracking branch 'master/develop' into develop
6 years ago
kira b69737a554 update
6 years ago
kira ed032015bc update
6 years ago
kira 735aaadc27 update
6 years ago
eason 77bb3ea3b5 fix actChairty
6 years ago
luoyang14z7 2ef48835b7 fix : ActChairty
6 years ago
luoyang14z7 af40eff1b5 fix : ActChairty
6 years ago
kira bd7786e40f Merge branch 'develop' of https://pms.globalfreepay.com/source/royalpay.manage into develop
6 years ago
kira a2c3128cb0 add log
6 years ago
luoyang14z7 b182cb794b fix : ActChairty
6 years ago
luoyang14z7 b3d57f7bd9 fix : ActChairty
6 years ago
kira c18da355f0 update
6 years ago
kira 70e234eff7 update act images
6 years ago
kira 106c9b98c6 update
6 years ago
kira 2d530b36c8 update act images
6 years ago
eason 446f394428 fix encourage
6 years ago
luoyang14z7 dbfa229946 fix : ActChairty
6 years ago
luoyang14z7 ef3cd5d822 fix : ActChairty
6 years ago
luoyang14z7 d5a2bfcb6f fix : ActChairty
6 years ago
yuan 48227e3705 Merge remote-tracking branch 'origin/master'
6 years ago
yuan 69a8655128 fix html
6 years ago
kira 119830f78c update act images
6 years ago
kira 8db86c6534 update act images
6 years ago
kira c9bfd87714 update
6 years ago
kira 026265fbaf fix
6 years ago
kira f9bde28cb7 update sql
6 years ago
kira db1298a2d7 Merge branch 'develop' of https://pms.globalfreepay.com/source/royalpay.manage into develop
6 years ago
kira a7b3e33ada update
6 years ago
yuan f41822308f Merge remote-tracking branch 'origin/develop' into develop
6 years ago
yuan 26d1390bcd fix html
6 years ago
kira 337ce2f305 Merge branch 'develop' of https://pms.globalfreepay.com/source/royalpay.manage into develop
6 years ago
kira b0fb825888 Merge branch 'hotfix' into develop
6 years ago
kira f7a78e6aac update chairty image
6 years ago
kira 954b9b6fd2 tmp
6 years ago
eason 4a170a5f94 fix
6 years ago
yuan 0a946ac1db Merge remote-tracking branch 'origin/develop' into develop
6 years ago
yuan 4291a53304 fix html
6 years ago
luoyang14z7 fc4646a770 fix : chairty
6 years ago
kira b3f1d26e7c tmp
6 years ago
kira 052fce1894 tmp
6 years ago
kira 170b78cc45 Merge branch 'develop' of https://pms.globalfreepay.com/source/royalpay.manage into develop
6 years ago
kira d61807c470 Merge branch 'hotfix' into develop
6 years ago
kira 3b388a57b2 fixbug unread notice
6 years ago
eason 413f38b1af Merge remote-tracking branch 'origin/develop' into develop
6 years ago
kira 2416999408 update
6 years ago
luoyang14z7 dc9a21b07f fix : develop_act_Chairty
6 years ago
eason e4eac97729 Merge branch 'new_bd_commissions' into develop
6 years ago
kira ed42133822 Merge branch 'develop_client_permission' into develop
6 years ago
kira 59bb6d7160 tmp
6 years ago
luoyang14z7 48d5daf4ca fix : develop_act_Chairty
6 years ago
luoyang14z7 3cd97ffbde fix : develop_act_Chairty
6 years ago
kira 8a5a0b0237 Merge branch 'develop_client_permission' into develop
6 years ago
kira 0c76b953a6 init
6 years ago
luoyang14z7 0bbd6b8297 fix : develop_act_Chairty
6 years ago
luoyang14z7 df14273f57 fix : develop_act_Chairty
6 years ago
kira 9b7e268788 Merge branch 'develop_client_permission' into develop
6 years ago
luoyang14z7 d490fbc865 add : develop_act_Chairty
6 years ago
yuan 4ffb9f7bcd Merge branch '7/10' into develop
6 years ago
yuan 1aabaa91ad move html
6 years ago
yuan 3e48a1c82a Merge branch '7/10' into develop
6 years ago
yuan ba846d542b add html
6 years ago
wangning ec4fe4976e Merge branch 'hotfix' into develop
6 years ago
wangning 9ea819a9df add act charity
6 years ago
wangning 6c7d02be00 update
6 years ago
yuan b2533ca349 fix BD Commissions
6 years ago
wangning df0616707e update 文案
6 years ago
wangning 8523b40ffb udpate
6 years ago
wangning 82df945256 update
6 years ago
luoyang14z7 08b1230f4f Merge remote-tracking branch 'work/develop_client_permission' into develop_client_permission
6 years ago
luoyang14z7 8f7d5f42c5 fix : develop_client_permission
6 years ago
wangning 9ca8f47d09 Merge branch 'develop_client_permission' of https://git.royalpay.com.au/git/royalv2.manage into develop_client_permission
6 years ago
yuan 0a13bcd876 fix BD Commissions
6 years ago
wangning 5ad385d8af Merge branch 'develop' into develop_client_permission
6 years ago
luoyang14z7 93ae3a7275 fix : develop_client_permission
6 years ago
luoyang14z7 77e0bc1044 Merge remote-tracking branch 'work/develop_client_permission' into develop_client_permission
6 years ago
luoyang14z7 2cec4309b5 fix : develop_client_permission
6 years ago
wangning 71303e4629 Merge branch 'hotfix' into develop
6 years ago
wangning 6e049b7dcb add images
6 years ago
luoyang14z7 9e5e07daef add : addPartner Auto Permission_Modules_Client
6 years ago
eason 9d39e2cad6 fix
6 years ago
wangning 9448ee6bb2 add permission check
6 years ago
yuan 0e5e7270dc fix BD Commissions
6 years ago
wangning ac472773f6 update
6 years ago
wangning 2b3671a8af merge
6 years ago
wangning fdab9c1d4c Merge branch 'develop' into develop_client_permission
6 years ago
luoyang14z7 1adf649076 add : partner Permission
6 years ago
wangning 2de776e4ca update
6 years ago
yuan c86e760dc8 fix BD Commissions
6 years ago
eason ac40e858da fix bd commission
6 years ago
wangning 4b53fee85c update
6 years ago
wangning 6b429eddb9 update
6 years ago
wangning 208ac577c3 update
6 years ago
wangning cd50cbf719 add cache clearing
6 years ago
wangning 6c752a3e0b add client permission page
6 years ago
yuan 9b031f73bb fix BD Commissions
6 years ago
wangning 9d50f0c687 tmp
6 years ago
wangning dfdb0bcac2 Merge branch 'hotfix' into develop
6 years ago
wangning 33c477a30c fixedDocument
6 years ago
wangning 80332ebeac tmp
6 years ago
wangning 36cac76a91 tmp
6 years ago
eason 216c4d072c fix
6 years ago
yuan a4fb797cf0 fix bug
6 years ago
eason 103ca68c2d fix
6 years ago
luoyang14z7 6454b39f91 注释auto add partner
6 years ago
luoyang14z7 1ecbc4894f Merge branch 'devtools' into develop
6 years ago
eason 309568e67f fix
6 years ago
luoyang14z7 ec3139d99c devtools:addaliexport
6 years ago
luoyang14z7 9e9f472f3d devtools : add
6 years ago
luoyang14z7 f70ead46a9 devtools
6 years ago
yuan 1781257140 fix bug
6 years ago
yuan 479009d671 fix bug
6 years ago
yuan 4ba4599b06 fix bug
6 years ago
yuan a22d860bd4 fix bug
6 years ago
yuan d163eb9949 增加hf pay intro
6 years ago
yuan e598d77925 增加hfindustry
6 years ago
eason 20360ade11 fix hf css
6 years ago
eason 573e3da805 Merge remote-tracking branch 'origin/develop' into develop
6 years ago
eason 6c1497b81e fix hf css
6 years ago
wangning 62e2850ce8 add hf apidoc
6 years ago
eason 212f9411d7 fix hf css
6 years ago
eason 877163f09c Merge remote-tracking branch 'origin/develop' into develop
6 years ago
eason 91bcf7f9b3 fix hf
6 years ago
yuan e0ffd52989 Merge branch '6/29' into develop
6 years ago
yuan a498e4dcd4 fix bug
6 years ago
yuan d2b8fe4109 Merge branch 'fix_6/29' into develop
6 years ago
yuan f06271cd09 修改自助申请列表bug
6 years ago
eason 0fe284cff8 Merge remote-tracking branch 'origin/develop' into develop
6 years ago
eason 3d6e0fa003 fix
6 years ago
yuan 410d1519de fix html
6 years ago
yuan 744a9b8463 Merge branch 'local_HF' into develop
6 years ago
wangning caab7a5c1c Merge branch 'develop' of https://git.royalpay.com.au/git/royalv2.manage into develop
6 years ago
wangning d83a5d5a32 rollback point
6 years ago
yuan 7e490fa7cd add gateway 14
6 years ago
eason 3d01808106 fix
6 years ago
eason 3ab85dd480 fix
6 years ago
yuan 62ad8b34f0 Merge branch 'develop' into local_HF
6 years ago
yuan 3b399f69c6 fix html bug
6 years ago
yuan 66ba4c7074 add getaway 14
6 years ago
yuan 0be969f168 fix bug
6 years ago