eason.qian
|
288f7d5e1f
|
fix
|
7 years ago |
wangning
|
ca9f07c7f8
|
merge confilct
|
7 years ago |
|
wangning
|
e8e8716569
|
Merge branch 'master' of https://git.royalpay.com.au/git/royalv2.manage
|
7 years ago |
|
wangning
|
d3f35457b2
|
fixbug
|
7 years ago |
|
eason.qian
|
95c379892f
|
Merge remote-tracking branch 'origin/mondelay' into mondelay
|
7 years ago |
|
eason.qian
|
88126bd581
|
fix
|
7 years ago |
|
wangning
|
65d0ab888a
|
merge conflict
|
7 years ago |
|
wangning
|
74861c60f7
|
add unread interface
|
7 years ago |
|
eason.qian
|
f39c80b2d6
|
fix
|
7 years ago |
yuan
|
2bc68b8456
|
fix~
|
7 years ago |
|
eason.qian
|
0d8ad430ec
|
Merge remote-tracking branch 'origin/develop' into develop
|
7 years ago |
|
eason.qian
|
33a0a78bba
|
fix
|
7 years ago |
|
eason.qian
|
8e886dec43
|
fix
|
7 years ago |
|
wangning
|
5be8e21b81
|
update
|
7 years ago |
|
yuan
|
d30c1b7312
|
fix~
|
7 years ago |
|
yuan
|
fbdb61e884
|
add mondelay 后台管理，与app 活动页配置页面
|
7 years ago |
|
eason.qian
|
6df34df759
|
Merge branch 'develop'
# Conflicts:
# src/db/modify.sql
|
7 years ago |
|
eason.qian
|
c4324f1407
|
Merge remote-tracking branch 'origin/master'
|
7 years ago |
|
eason.qian
|
e234e5745f
|
fix 关闭合同提醒
|
7 years ago |
|
eason.qian
|
08426e8a5a
|
fix
|
7 years ago |
|
eason.qian
|
4ac5d4132c
|
Merge remote-tracking branch 'origin/mondelay' into mondelay
|
7 years ago |
|
eason.qian
|
950459e621
|
fix
|
7 years ago |
|
wangning
|
4a4e6ad61f
|
update
|
7 years ago |
|
wangning
|
ff4bcc07f5
|
Merge branch 'update' into develop
|
7 years ago |
|
wangning
|
9a5cd5fa85
|
Merge branch 'master' of https://git.royalpay.com.au/git/royalv2.manage
|
7 years ago |
|
wangning
|
cc94c56c5b
|
update
|
7 years ago |
|
wangning
|
92d2273f16
|
update
|
7 years ago |
yixian
|
39faf54c55
|
document update
|
7 years ago |
|
yixian
|
34d5e0121c
|
folder name update
|
7 years ago |
|
wangning
|
ab995db58f
|
Merge branch 'develop' of https://git.royalpay.com.au/git/royalv2.manage into develop
|
7 years ago |
|
wangning
|
5779c9c1d6
|
Merge branch 'mail' into develop
|
7 years ago |
|
wangning
|
2e4bf7f332
|
init mail add short_name
|
7 years ago |
|
yixian
|
7d7ef6f2e6
|
Merge remote-tracking branch 'origin/master'
|
7 years ago |
|
yixian
|
aa70140535
|
nap
|
7 years ago |
|
eason.qian
|
df01e3f59b
|
fix
|
7 years ago |
|
eason.qian
|
7f4f195fee
|
Merge remote-tracking branch 'origin/master'
|
7 years ago |
|
eason.qian
|
d2ef9d0c25
|
Merge branch 'master' of /Users/yishuqian/Documents/workspace/royalpay/royalv2.manage with conflicts.
|
7 years ago |
|
wangning
|
8d08151728
|
Merge branch 'develop' of https://git.royalpay.com.au/git/royalv2.manage into develop
|
7 years ago |
|
wangning
|
98843f0513
|
fixbug download contract
|
7 years ago |
|
wangning
|
5589d83f0d
|
add exchange rate cache
|
7 years ago |
|
yuan
|
9992cc0294
|
fix~
|
7 years ago |
|
yuan
|
b9d2fd2cf8
|
fix html
|
7 years ago |
|
wangning
|
3358eb269c
|
update
|
7 years ago |
|
wangning
|
8943d91097
|
fixbug contract greenchannel
|
7 years ago |
|
wangning
|
1fe41d5421
|
update
|
7 years ago |
|
eason.qian
|
0ea54d7191
|
fix
|
7 years ago |
|
yuan
|
df99ae3218
|
add title
|
7 years ago |
|
wangning
|
198b60e0d9
|
Merge branch 'develop_device_offline' into develop
# Conflicts:
# src/main/java/au/com/royalpay/payment/manage/merchants/core/impls/ClientManagerImpl.java
|
7 years ago |
|
wangning
|
f48ccb5325
|
add contract analysis webview
|
7 years ago |
|
wangning
|
3321310500
|
update
|
7 years ago |
|
wangning
|
7c760fe803
|
update
|
7 years ago |
|
wangning
|
e023b105e9
|
update
|
7 years ago |
|
wangning
|
3b056b4092
|
update
|
7 years ago |
|
wangning
|
bcaa7a85ff
|
update
|
7 years ago |
|
eason.qian
|
4d23abd2a3
|
fix
|
7 years ago |
|
eason.qian
|
7ee71d67e8
|
Merge branch 'agreement' into develop
|
7 years ago |
|
eason.qian
|
bce1995633
|
fix
|
7 years ago |
|
wangning
|
ab94d60512
|
update
|
7 years ago |
|
wangning
|
7ab8a06feb
|
updateupdate
|
7 years ago |
|
wangning
|
81fb75377f
|
update
|
7 years ago |
|
wangning
|
b10606486b
|
update sql
|
7 years ago |
|
wangning
|
c2b9fc6424
|
update
|
7 years ago |
|
wangning
|
f79085be54
|
update
|
7 years ago |
|
eason.qian
|
d99cdd94e0
|
fix
|
7 years ago |
|
eason.qian
|
b2fca795d0
|
fix
|
7 years ago |
|
wangning
|
55bad532b4
|
sign channel
|
7 years ago |
|
wangning
|
ff32f2cad2
|
update
|
7 years ago |
|
wangning
|
900f31a2c6
|
update
|
7 years ago |
|
wangning
|
8f5e2db5a5
|
update
|
7 years ago |
Tayl0r
|
4bd4820126
|
[Y] 修改上传文件大小
|
7 years ago |
|
wangning
|
e7785b4699
|
update
|
7 years ago |
|
wangning
|
3f604e71ac
|
Merge branch 'agreement' of https://git.royalpay.com.au/git/royalv2.manage into agreement
|
7 years ago |
|
eason.qian
|
d35b6af86d
|
Merge remote-tracking branch 'origin/agreement' into agreement
|
7 years ago |
|
eason.qian
|
e772fef8c3
|
new act
|
7 years ago |
|
wangning
|
65975c4f6e
|
update
|
7 years ago |
|
wangning
|
15fd0edfc5
|
update
|
7 years ago |
|
Tayl0r
|
be9380de3d
|
[Y] 合同测试生成
|
7 years ago |
|
wangning
|
7de1eed456
|
update
|
7 years ago |
|
wangning
|
759c752455
|
update
|
7 years ago |
|
wangning
|
1e380cc65a
|
update
|
7 years ago |
|
wangning
|
81ecb15c05
|
update
|
7 years ago |
|
wangning
|
7ee91fb885
|
update
|
7 years ago |
|
wangning
|
1731d9e973
|
update
|
7 years ago |
|
yuan
|
2e3ab4a7f0
|
Merge remote-tracking branch 'origin/mondelay' into mondelay
|
7 years ago |
|
yuan
|
fca8e8695c
|
fix~
|
7 years ago |
|
eason.qian
|
0be0167cc2
|
new act
|
7 years ago |
|
wangning
|
8127076865
|
Merge branch 'agreement' of https://git.royalpay.com.au/git/royalv2.manage into agreement
|
7 years ago |
|
yuan
|
f278517d63
|
add html
|
7 years ago |
|
wangning
|
fef08a3f58
|
update
|
7 years ago |
|
eason.qian
|
585401834b
|
new act
|
7 years ago |
|
wangning
|
1019f2ef9f
|
Merge branch 'develop_contract' into agreement
|
7 years ago |
|
wangning
|
863b7794e3
|
update
|
7 years ago |
|
yixian
|
b1bebb8d0f
|
web error
|
7 years ago |
|
yixian
|
d778ad622c
|
web error
|
7 years ago |
|
wangning
|
5db7294880
|
update
|
7 years ago |
|
eason.qian
|
93b4ac57b2
|
new act
|
7 years ago |
|
wangning
|
29d7835400
|
update
|
7 years ago |
|
eason.qian
|
92a9fb7482
|
new act
|
7 years ago |
|
wangning
|
206106caac
|
update
|
7 years ago |
|
wangning
|
25d6d34a3f
|
update
|
7 years ago |
|
wangning
|
115e2ffbee
|
contract
|
7 years ago |
|
eason.qian
|
5d79371788
|
new act
|
7 years ago |
|
eason.qian
|
cf805e51b8
|
new act
|
7 years ago |
|
eason.qian
|
392e1814e5
|
fix
|
7 years ago |
|
yixian
|
11a81ba7b6
|
Merge remote-tracking branch 'origin/develop' into develop
|
7 years ago |
|
yixian
|
de825dee0d
|
Merge branch 'hotfix_20180306_exporterror' into develop
|
7 years ago |
|
yixian
|
5c57271ea9
|
Merge remote-tracking branch 'origin/master'
|
7 years ago |
|
yixian
|
715f718092
|
export error
|
7 years ago |
|
eason.qian
|
a0df3ab9ee
|
Merge branch 'develop'
|
7 years ago |
|
eason.qian
|
b9c4d60607
|
Merge remote-tracking branch 'origin/develop' into develop
|
7 years ago |
|
eason.qian
|
188ee72cd0
|
fix
|
7 years ago |
|
yixian
|
7aae1e7c6b
|
Merge remote-tracking branch 'origin/develop' into develop
|
7 years ago |
|
yixian
|
b05de3e6ef
|
Merge branch 'hotfix20180306transdownload'
# Conflicts:
# src/main/ui/static/payment/tradelog/templates/partner_settlement_logs.html
|
7 years ago |
|
yixian
|
b93660ca9e
|
client support multiple settles in one day
|
7 years ago |
|
yixian
|
8df1425bd2
|
client support multiple settles in one day
|
7 years ago |
|
yixian
|
3e13c03215
|
client support multiple settles in one day
|
7 years ago |
|
yixian
|
b2dccadab2
|
client support multiple settles in one day
|
7 years ago |
|
wangning
|
0bcce4efbc
|
Merge branch 'master' of https://git.royalpay.com.au/git/royalv2.manage
|
7 years ago |
|
wangning
|
daae66eb96
|
Merge branch 'develop' of https://git.royalpay.com.au/git/royalv2.manage into develop
|
7 years ago |
|
wangning
|
3b7ff0c889
|
app udpate
|
7 years ago |
|
eason.qian
|
89a9c1c061
|
fix change logo
|
7 years ago |
|
wangning
|
6b20fe43d6
|
device off line
|
7 years ago |
|
eason.qian
|
cfb3070c49
|
fix
|
7 years ago |
|
wangning
|
1c471262e4
|
Merge branch 'master' of https://git.royalpay.com.au/git/royalv2.manage
|
7 years ago |
|
wangning
|
7df8eff2fd
|
fixbug
|
7 years ago |
|
yixian
|
84b0fdaa85
|
hide gst in customer's view
|
7 years ago |
|
yixian
|
ab82fb7661
|
Merge branch 'hotfix20180227gst'
|
7 years ago |
|
yixian
|
349416eda6
|
hide gst in customer's view
|
7 years ago |
|
yixian
|
cdb23f746b
|
Merge remote-tracking branch 'origin/master'
# Conflicts:
# src/main/java/au/com/royalpay/payment/manage/merchants/core/impls/ClientManagerImpl.java
|
7 years ago |
|
yixian
|
d273b75fbc
|
hide gst in customer's view
|
7 years ago |
|
yixian
|
9f70551e39
|
Merge branch 'hotfix20180227gst'
|
7 years ago |
|
yixian
|
138820f1bd
|
gst in surcharge config
|
7 years ago |
|
wangning
|
58f40e8248
|
device offline
|
7 years ago |
|
wangning
|
e363faba95
|
Merge branch 'master' of https://git.royalpay.com.au/git/royalv2.manage
|
7 years ago |
|
wangning
|
464fc1b474
|
update
|
7 years ago |
|
eason.qian
|
106ca85bfb
|
fix
|
7 years ago |
|
eason.qian
|
636ab2cf01
|
fix
|
7 years ago |
|
eason.qian
|
9b7c6ab014
|
fix
|
7 years ago |
|
wangning
|
e8478bb641
|
update
|
7 years ago |
|
eason.qian
|
4d2e010ed7
|
fix
|
7 years ago |
|
wangning
|
4eb69c41a0
|
update
|
7 years ago |
|
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
|
d5acfc2bbd
|
remove unnecessary code
|
7 years ago |
|
eason.qian
|
b0ca17b063
|
orderDetail add tax_amount
|
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
|
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 |
|
Tayl0r
|
e7c5ed66c4
|
Merge branch 'master' of https://git.royalpay.com.au/git/royalv2.manage
|
7 years ago |
|
Tayl0r
|
6af568cff4
|
Merge branch 'develop'
|
7 years ago |
|
Tayl0r
|
f9d4a39cf1
|
[Y] 指定退款审核人
|
7 years ago |
|
yuan
|
f4cb0221fe
|
修改交易额
|
7 years ago |
|
yuan
|
e968c49c2b
|
fix 账号组织bug
|
7 years ago |
yixian
|
c71e629188
|
gst support
|
7 years ago |
|
yuan
|
bf9a4f81e0
|
二级组织费率限制
|
7 years ago |
|
wangning
|
db26a8bc29
|
update
|
7 years ago |
|
eason.qian
|
b169e046b4
|
Merge branch 'develop'
|
7 years ago |
|
eason.qian
|
c228696136
|
fix~
|
7 years ago |
|
wangning
|
bf69dfbfe5
|
add cancle time
|
7 years ago |
|
wangning
|
7728c15c81
|
update
|
7 years ago |
|
wangning
|
85e9c392f9
|
update
|
7 years ago |
|
wangning
|
b476f2f898
|
update
|
7 years ago |
|
macminiuser
|
8bacdb61ea
|
交易额+退款+退款+退款笔数+App流水接口、交易额相关接口调整
|
7 years ago |
|
wangning
|
b89f0072c4
|
update
|
7 years ago |
|
eason.qian
|
e53f2eab57
|
Merge branch 'develop'
|
7 years ago |
|
eason.qian
|
d3c0f138c4
|
开放Cashier的settlement log下载权限
|
7 years ago |
|
yuan
|
d4a251a395
|
增加二级组织费率限制
|
7 years ago |
|
Tayl0r
|
ce38db718d
|
ignore
|
7 years ago |
|
wangning
|
4eaddd9cf1
|
update
|
7 years ago |
|
Tayl0r
|
0600b30702
|
Merge branch 'develop'
|
7 years ago |
|
Tayl0r
|
87584077f9
|
[Y] surcharge为实时计算
|
7 years ago |
|
Tayl0r
|
81fa3ef96c
|
Revert "ignore"
This reverts commit ae589d5
|
7 years ago |
|
Tayl0r
|
25416d5478
|
Merge branch 'develop'
|
7 years ago |
|
Tayl0r
|
ae589d563a
|
ignore
|
7 years ago |
|
Tayl0r
|
eb5fdb48df
|
[Y] 新增AlipayOnline对账查询
|
7 years ago |
|
yuan
|
9b9a477f78
|
商户管理增加bd分组筛选
|
7 years ago |
|
wangning
|
db4e04451e
|
bill
|
7 years ago |
|
eason.qian
|
f3ddd64c23
|
Merge branch 'develop'
|
7 years ago |
|
eason.qian
|
f40a9b5721
|
fix exchange rate
|
7 years ago |
|
eason.qian
|
945a5bee96
|
Merge branch 'develop'
|
7 years ago |
|
eason.qian
|
cb9084e768
|
fix exchange rate
|
7 years ago |
|
eason.qian
|
a9fdea18c2
|
Merge branch 'develop'
|
7 years ago |
|
eason.qian
|
cff32aa65d
|
fix exchange rate
|
7 years ago |
|
eason.qian
|
16095a9122
|
fix
|
7 years ago |
|
yuan
|
d21d2210c6
|
修改一级组织显示，账号管理增加二级组织筛选
|
7 years ago |
|
wangning
|
efd5d8d14d
|
bill init
|
7 years ago |
|
yixian
|
7cd41b90ee
|
tradelog page
|
7 years ago |
|
yuan
|
7982c078cd
|
fix~
|
7 years ago |
|
yuan
|
8de1d7b688
|
修改页面年份显示
|
7 years ago |
|
wangning
|
2ecb3920e2
|
Merge branch 'updat' into develop
|
7 years ago |
|
wangning
|
d5165e50aa
|
fixbug BD leader Commissions
|
7 years ago |
|
yuan
|
345c48ca8c
|
修改‘合伙人提成’与‘BD提成’页面年份显示
|
7 years ago |
|
eason.qian
|
599481c31a
|
Merge remote-tracking branch 'origin/develop' into develop
|
7 years ago |
|
eason.qian
|
e1dea2cbbc
|
fix
|
7 years ago |
|
yuan
|
ed380d8f9f
|
fix~
|
7 years ago |
|
wangning
|
21e77daeba
|
Merge branch 'update' into develop
|
7 years ago |
|
wangning
|
92220fb273
|
cache exchange_rates
|
7 years ago |
|
wangning
|
aaad7455bc
|
Merge branch 'updat' into develop
|
7 years ago |
|
wangning
|
c3d5ffa457
|
update
|
7 years ago |
|
yixian
|
1d95427e60
|
Merge remote-tracking branch 'origin/master'
|
7 years ago |
|
yixian
|
86aa70508c
|
Merge remote-tracking branch 'origin/develop' into develop
|
7 years ago |
|
yixian
|
3407a0f9cf
|
Merge branch 'hotfix20180131invoice' into develop
|
7 years ago |
|
yixian
|
75e6778591
|
Merge branch 'hotfix20180131invoice'
|
7 years ago |
|
yixian
|
afb9586017
|
asynchronize redirect after payment
|
7 years ago |
|
wangning
|
c894a782db
|
Merge branch 'update' into develop
|
7 years ago |
|
yixian
|
447e8bd7ef
|
invoice with gst
|
7 years ago |
|
wangning
|
6f390ad15e
|
update
|
7 years ago |
|
yixian
|
cf7d094665
|
Merge branch 'hotfix20180131invoice' into develop
|
7 years ago |
|
yixian
|
768b666977
|
Merge branch 'hotfix20180131invoice'
|
7 years ago |
|
yixian
|
2502a96da6
|
invoice
|
7 years ago |
|
wangning
|
2e95ddec2e
|
Merge branch 'fixbug' into develop
|
7 years ago |
“sunn”
|
e134c27257
|
[Y] 商户编码添加默认值（6位数字字母组合）且不可修改
|
7 years ago |
|
yixian
|
0d7b31696b
|
invoice
|
7 years ago |
|
wangning
|
c63da8fed1
|
fixbug
|
7 years ago |
|
yixian
|
1d7146e6bf
|
Merge remote-tracking branch 'origin/develop' into develop
|
7 years ago |
|
yixian
|
d98624f2ce
|
invoice
|
7 years ago |
|
wangning
|
912c71f167
|
Merge branch 'develop' of https://git.royalpay.com.au/git/royalv2.manage into develop
|
7 years ago |
|
wangning
|
c24f0a6cca
|
Merge branch 'updateOfei' into develop
|
7 years ago |
|
wangning
|
4550ed0958
|
update
|
7 years ago |
|
yuan
|
d78aea4331
|
fix~
|
7 years ago |
|
wangning
|
522857d479
|
Merge branch 'develop' of https://git.royalpay.com.au/git/royalv2.manage into develop
|
7 years ago |
|
wangning
|
e322e6a631
|
Merge branch 'ofeiQB' into develop
|
7 years ago |
|
wangning
|
bf9f170a31
|
update
|
7 years ago |
|
yuan
|
521002a8b6
|
增加后台微信商户进件
|
7 years ago |
|
wangning
|
22d9738920
|
QB top up
|
7 years ago |
|
yuan
|
64d17e4027
|
Merge branch 'branch_v1' into develop
|
7 years ago |
|
yuan
|
86d07c5f69
|
fix~
|
7 years ago |
|
wangning
|
45b3149865
|
Merge branch 'changePWD' into develop
|
7 years ago |
|
wangning
|
5168d717f8
|
fixbug change pwd
|
7 years ago |
|
eason.qian
|
1bdcf5fa52
|
fix
|
7 years ago |
|
eason.qian
|
262ce70a7d
|
fix
|
7 years ago |
|
yuan
|
9cdc0012b1
|
fix~
|
7 years ago |
|
yuan
|
59683281f2
|
fix~
|
7 years ago |
|
yuan
|
314b56cfbf
|
Merge branch 'brancah' into develop
|
7 years ago |
|
yuan
|
7d4eb6333d
|
fix~
|
7 years ago |
|
yuan
|
511faafdda
|
fix~
|
7 years ago |
|
wangning
|
57b2dba12b
|
fixbug
|
7 years ago |
|
wangning
|
25eb4cc11b
|
fixbug
|
7 years ago |
|
wangning
|
ed75226b06
|
fixbug
|
7 years ago |
|
wangning
|
3c9e1bedcc
|
Merge branch 'master' of https://git.royalpay.com.au/git/royalv2.manage
|
7 years ago |
|
wangning
|
95e2330926
|
fixbug weekReport
|
7 years ago |
|
yuan
|
7b563647f4
|
fix~
|
7 years ago |
|
wangning
|
6d727a4b7a
|
update
|
7 years ago |
|
eason.qian
|
d93951a95c
|
fix
|
7 years ago |
|
eason.qian
|
5f262bb891
|
fix
|
7 years ago |
|
wangning
|
da9edeb525
|
Merge branch 'develop' of https://git.royalpay.com.au/git/royalv2.manage into develop
|
7 years ago |
|
wangning
|
6512c4d249
|
Merge branch 'update1' into develop
# Conflicts:
# src/db/modify.sql
# src/main/ui/static/analysis/org/templates/analysis_org.html
|
7 years ago |
|
wangning
|
12640d5d67
|
update
|
7 years ago |
|
yuan
|
653ee2c04f
|
fix~
|
7 years ago |
|
wangning
|
adac252b26
|
Merge branch 'master' of https://git.royalpay.com.au/git/royalv2.manage
|
7 years ago |
|
wangning
|
2bea260aa0
|
Merge branch 'update' into develop
# Conflicts:
# src/db/modify.sql
|
7 years ago |
|
wangning
|
b153a3add8
|
update
|
7 years ago |
|
eason.qian
|
be08073c17
|
Merge branch 'develop'
|
7 years ago |
|
eason.qian
|
d3d0419c31
|
Merge remote-tracking branch 'origin/master'
# Conflicts:
# src/db/modify.sql
# src/main/ui/static/analysis/org/templates/analysis_org.html
|
7 years ago |
|
wangning
|
a2ff3bb338
|
Merge branch 'develop' of https://git.royalpay.com.au/git/royalv2.manage into develop
|
7 years ago |
|
wangning
|
e391b89723
|
Merge branch 'mergeReferrer&CityPartner' into develop
# Conflicts:
# src/db/modify.sql
# src/main/ui/static/analysis/org/templates/analysis_org.html
|
7 years ago |
|
wangning
|
48184d9b60
|
Merge branch 'CustomerImpression' into develop
|
7 years ago |
|
wangning
|
7e050369ee
|
Merge branch 'mergeReferrer&CityPartner'
# Conflicts:
# src/db/modify.sql
|
7 years ago |
|
wangning
|
615064d1b9
|
Merge branch 'CustomerImpression'
|
7 years ago |
|
eason.qian
|
e1f42e1569
|
Merge remote-tracking branch 'origin/master'
|
7 years ago |
