wangning
|
6c201c3e18
|
rollbakc conrtract
|
7 years ago |
yuan
|
8ce79a8e16
|
增加活动开始与结束时间
|
7 years ago |
|
wangning
|
e99dbd910a
|
update
|
7 years ago |
eason.qian
|
288f7d5e1f
|
fix
|
7 years ago |
|
wangning
|
ca9f07c7f8
|
merge confilct
|
7 years ago |
|
wangning
|
c1ccdb8090
|
Merge branch 'develop' of https://git.royalpay.com.au/git/royalv2.manage into develop
|
7 years ago |
|
wangning
|
38e6a7debb
|
Merge branch 'hotfix' into develop
|
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
|
b6b3f789e1
|
Merge branch 'update' into develop
|
7 years ago |
|
wangning
|
5be8e21b81
|
update
|
7 years ago |
|
yuan
|
d30c1b7312
|
fix~
|
7 years ago |
|
yuan
|
fbdb61e884
|
add mondelay 后台管理，与app 活动页配置页面
|
7 years ago |
|
wangning
|
42be8e879c
|
Merge branch 'develop' of https://git.royalpay.com.au/git/royalv2.manage into develop
|
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
|
3b593ec9fb
|
Merge branch 'update' into develop
|
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 |
