2412 Commits (ccbd5a9c3ab605d26c52d981fd23cd9065c69f9a)

Author SHA1 Message Date
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
yixian 3bf47ef971 document fix
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
eason 010bd56a61 fix
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 eb4ffa947d update
6 years ago
kira b3d8318097 Merge branch 'master' of https://pms.globalfreepay.com/source/royalpay.manage
6 years ago
kira a328af2b7a tmp
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
kira 07d7995a6a update
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