luoyang
|
88b7fd4d23
|
add 临时合同
|
6 years ago |
luoyang
|
8496689ca0
|
add 临时合同
|
6 years ago |
luoyang
|
971f0ca39a
|
revert v1&v2-manager.html
|
6 years ago |
luoyang
|
7e62aeb6b2
|
fix v1&v2-manager.html
|
6 years ago |
luoyang
|
5c4e012148
|
fix v1&v2-manager.html
|
6 years ago |
yangkai
|
aa43765010
|
fix
|
6 years ago |
luoyang
|
d0ea610146
|
fix v2-manager.html one role
|
6 years ago |
luoyang
|
648cba58ce
|
Merge branch 'develop_newUI' into develop
|
6 years ago |
yangkai
|
2787998961
|
fix
|
6 years ago |
yangkai
|
43098e4550
|
fix
|
6 years ago |
luoyang
|
21ce0b9d53
|
fix v2-manager.html header rolenow
|
6 years ago |
luoyang
|
d5317359c5
|
fix v2-manager.html header rolenow
|
6 years ago |
luoyang
|
e1e6f8a8c5
|
fix v2-manager.html header display
|
6 years ago |
luoyang
|
f7a229cddd
|
fix v1-manager.html permission
|
6 years ago |
taylor.dang
|
01cfdcdb55
|
Merge branch 'develop'
|
6 years ago |
taylor.dang
|
72d5b25c7d
|
fix
|
6 years ago |
luoyang
|
81e1584c9a
|
fix v1-manager.html
|
6 years ago |
taylor.dang
|
f257c60950
|
Merge branch 'develop'
|
6 years ago |
taylor.dang
|
8b813a0e51
|
费率自动延期
|
6 years ago |
yangkai
|
8ff1cc35af
|
fix
|
6 years ago |
yangkai
|
7fc914f6ce
|
fix
|
6 years ago |
luoyang
|
e19685ad99
|
fix v2-manager.html perimission
|
6 years ago |
luoyang
|
ec010193ce
|
fix v2-manager.html role
|
6 years ago |
luoyang
|
28a5d26c4f
|
fix v2-manager.html permission
|
6 years ago |
yangkai
|
ac7836da81
|
页面头部修改
|
6 years ago |
luoyang
|
465772c5dc
|
fix v1-manager.html & v2-manager.html
|
6 years ago |
yangkai
|
9c28923818
|
fix
|
6 years ago |
yangkai
|
b5b6a8b286
|
fix
|
6 years ago |
luoyang
|
7d7ee28a4b
|
Merge remote-tracking branch 'origin/develop_newUI' into develop_newUI
|
6 years ago |
luoyang
|
c63931939f
|
fix v1-manager.html
|
6 years ago |
yangkai
|
55879c5c20
|
交易管理ui调整
|
6 years ago |
luoyang
|
919c7783be
|
fix boot
|
6 years ago |
yangkai
|
a0d7a4c631
|
[fix]商户统计
|
6 years ago |
luoyang
|
643e8fc533
|
fix servant
|
6 years ago |
luoyang
|
dd34208113
|
fix servant
|
6 years ago |
luoyang
|
24555404a2
|
fix servant
|
6 years ago |
luoyang
|
784bd85360
|
change new ROLE & permission role
|
6 years ago |
luoyang
|
adce31c4bf
|
fix gatewayjs redirect
|
6 years ago |
luoyang
|
162f4a7ef4
|
fix gatewayjs redirect
|
6 years ago |
yixian
|
2d8bf8931d
|
Merge remote-tracking branch 'origin/develop' into develop
|
6 years ago |
yixian
|
39e44c076d
|
ABAfile comment update
|
6 years ago |
taylor.dang
|
eb77903ec1
|
Merge branch 'develop'
|
6 years ago |
taylor.dang
|
30e1561315
|
app rpay订单查询
|
6 years ago |
luoyang
|
3ac5703edc
|
fix rpay+switchMerchantSettle
|
6 years ago |
luoyang
|
bf8a94a620
|
fix rpay+switchMerchantSettle
|
6 years ago |
taylor.dang
|
52612cad65
|
Merge branch 'develop'
|
6 years ago |
luoyang
|
546df5fef0
|
fix rpay+ modifySurchargeConfig on
|
6 years ago |
luoyang
|
7c0bc3f019
|
add version controller
|
6 years ago |
taylor.dang
|
a6042c523e
|
Merge branch 'develop'
|
6 years ago |
taylor.dang
|
3ede159d97
|
fix
|
6 years ago |
yangkai
|
b947cc63a0
|
fix
|
6 years ago |
luoyang
|
93f2af4d52
|
fix BD-ng-click
|
6 years ago |
luoyang
|
3ff563307f
|
add ui-route && permission
|
6 years ago |
yangkai
|
1fdbce200c
|
fix
|
6 years ago |
luoyang
|
53f60669a3
|
fix something
|
6 years ago |
luoyang
|
419758b21f
|
fix ui-view
|
6 years ago |
yangkai
|
54b166a8f5
|
Main_Menu页面
|
6 years ago |
luoyang
|
62e91a49cc
|
add copyright
|
6 years ago |
taylor.dang
|
5dbcfeedeb
|
fix
|
6 years ago |
taylor.dang
|
2a8ffb5475
|
fix
|
6 years ago |
taylor.dang
|
cd0695f33b
|
fix
|
6 years ago |
luoyang
|
2e207ae8a1
|
add copyright
|
6 years ago |
taylor.dang
|
7cdad1807d
|
Merge branch 'develop'
|
6 years ago |
luoyang
|
7b5ed75947
|
managerMenu.js test
|
6 years ago |
yangkai
|
9b4900cfe0
|
携程卡券核销添加备注
|
6 years ago |
luoyang
|
54f62e4c86
|
add managerMenu.js
|
6 years ago |
luoyang
|
17045552f0
|
new Manage UI - manage.html
|
6 years ago |
taylor.dang
|
377ff2659b
|
Merge branch 'develop'
|
6 years ago |
hellolujian
|
c2c6eec7c1
|
[fix]更正royalpay图标
|
6 years ago |
hellolujian
|
eed0365d5b
|
[fix]optimize getBDSaleList
|
6 years ago |
hellolujian
|
2baadc3bd8
|
[fix]optimize listorders
|
6 years ago |
taylor.dang
|
64d9ce4048
|
Merge branch 'develop'
|
6 years ago |
taylor.dang
|
dc0d79a4c1
|
remove point dialog
|
6 years ago |
ying
|
04662963c5
|
fix api.js
|
6 years ago |
taylor.dang
|
0de6b19eed
|
Merge branch 'develop'
|
6 years ago |
taylor.dang
|
09cd0ffa32
|
rpay+ 订单金额额外处理 + 账单创建时间处理
|
6 years ago |
taylor.dang
|
9c5a7e4ae9
|
Merge branch 'develop'
|
6 years ago |
taylor.dang
|
5e495fb765
|
fix
|
6 years ago |
taylor.dang
|
ea67c86fff
|
Merge branch 'develop'
|
6 years ago |
taylor.dang
|
caa9ae63be
|
修复新增费率异常+ 暂不启用rpay+费率修改api
|
6 years ago |
taylor.dang
|
c7b8502c29
|
fix订单流水时间为系统创建transaction时间
|
6 years ago |
taylor.dang
|
a953b9042d
|
fix订单流水时间为系统创建transaction时间
|
6 years ago |
yixian
|
2e8ba2ab29
|
Merge remote-tracking branch 'origin/master'
|
6 years ago |
yixian
|
bb6a296387
|
手动清算提现规则调整
|
6 years ago |
luoyang
|
7fd4d515e0
|
暂时关闭clearing自动续约时更新Rpay+
|
6 years ago |
luoyang
|
ff14cdd63b
|
暂时关闭clearing自动续约时更新Rpay+
|
6 years ago |
hellolujian
|
d120f8156b
|
[fix]
|
6 years ago |
hellolujian
|
c7d6ad769a
|
[fix]
|
6 years ago |
hellolujian
|
74892d8908
|
[fix]
|
6 years ago |
luoyang
|
4738df4050
|
fix rpay+ merchant
|
6 years ago |
hellolujian
|
f0b17d8504
|
[fix]新增transaction_fee字段
|
6 years ago |
hellolujian
|
447fea52e6
|
[fix]
|
6 years ago |
hellolujian
|
7401a9e414
|
[fix]
|
6 years ago |
hellolujian
|
3fac4f2c58
|
[fix]优化SQL
|
6 years ago |
hellolujian
|
d8d6855d13
|
[fix]优化sql
|
6 years ago |
luoyang
|
a78fd1542d
|
fix rate_warning
|
6 years ago |
luoyang
|
a2de0ea35e
|
fix Dashboard TopOrderFee
|
6 years ago |
luoyang
|
c5e246c538
|
fix Rpay-merchant
|
6 years ago |
yangkai
|
6ded918861
|
修改url
|
6 years ago |
yangkai
|
fb127556c3
|
Merge remote-tracking branch 'origin/develop' into develop
|
6 years ago |