wangning
|
9bc84b33a8
|
fixbug
|
9 years ago |
yuan
|
9ffb7c4bd1
|
显示规则
|
9 years ago |
eason.qian
|
b49f43c3bb
|
Merge branch 'mondelay' into develop
|
9 years ago |
|
eason.qian
|
9ac5b10c0b
|
Merge remote-tracking branch 'origin/mondelay' into mondelay
|
9 years ago |
|
eason.qian
|
df70c356c6
|
fix
|
9 years ago |
|
eason.qian
|
9bafbc56c2
|
Merge branch 'notice' into develop
# Conflicts:
# src/db/modify.sql
# src/main/java/au/com/royalpay/payment/manage/appclient/web/RetailAppController.java
|
9 years ago |
|
yuan
|
6daca4a0a9
|
Merge remote-tracking branch 'origin/mondelay' into mondelay
|
9 years ago |
|
yuan
|
68be8297b0
|
fix~
|
9 years ago |
|
eason.qian
|
52b844cc8a
|
Merge branch 'mondelay' into develop
|
9 years ago |
|
eason.qian
|
b7459efc5b
|
fix
|
9 years ago |
|
eason.qian
|
6eb7c8b64f
|
Merge branch 'mondelay' into develop
# Conflicts:
# src/db/modify.sql
# src/main/java/au/com/royalpay/payment/manage/appclient/web/RetailAppController.java
|
9 years ago |
|
eason.qian
|
a887493153
|
fix
|
9 years ago |
|
eason.qian
|
1e984e8e68
|
fix
|
9 years ago |
|
yuan
|
42ea3adcd7
|
fix~
|
9 years ago |
|
eason.qian
|
f63f6bc001
|
fix
|
9 years ago |
|
eason.qian
|
ca1c61d666
|
fix
|
9 years ago |
|
wangning
|
e8076ea45d
|
Merge branch 'hotfix_contract' into develop
|
9 years ago |
|
wangning
|
6c201c3e18
|
rollbakc conrtract
|
9 years ago |
|
yuan
|
8ce79a8e16
|
增加活动开始与结束时间
|
9 years ago |
|
wangning
|
e99dbd910a
|
update
|
9 years ago |
|
eason.qian
|
288f7d5e1f
|
fix
|
9 years ago |
|
wangning
|
ca9f07c7f8
|
merge confilct
|
9 years ago |
|
wangning
|
c1ccdb8090
|
Merge branch 'develop' of https://git.royalpay.com.au/git/royalv2.manage into develop
|
9 years ago |
|
wangning
|
38e6a7debb
|
Merge branch 'hotfix' into develop
|
9 years ago |
|
wangning
|
e8e8716569
|
Merge branch 'master' of https://git.royalpay.com.au/git/royalv2.manage
|
9 years ago |
|
wangning
|
d3f35457b2
|
fixbug
|
9 years ago |
|
eason.qian
|
95c379892f
|
Merge remote-tracking branch 'origin/mondelay' into mondelay
|
9 years ago |
|
eason.qian
|
88126bd581
|
fix
|
9 years ago |
|
wangning
|
65d0ab888a
|
merge conflict
|
9 years ago |
|
wangning
|
74861c60f7
|
add unread interface
|
9 years ago |
|
eason.qian
|
f39c80b2d6
|
fix
|
9 years ago |
|
yuan
|
2bc68b8456
|
fix~
|
9 years ago |
|
eason.qian
|
0d8ad430ec
|
Merge remote-tracking branch 'origin/develop' into develop
|
9 years ago |
|
eason.qian
|
33a0a78bba
|
fix
|
9 years ago |
|
eason.qian
|
8e886dec43
|
fix
|
9 years ago |
|
wangning
|
b6b3f789e1
|
Merge branch 'update' into develop
|
9 years ago |
|
wangning
|
5be8e21b81
|
update
|
9 years ago |
|
yuan
|
d30c1b7312
|
fix~
|
9 years ago |
|
yuan
|
fbdb61e884
|
add mondelay 后台管理，与app 活动页配置页面
|
9 years ago |
|
wangning
|
42be8e879c
|
Merge branch 'develop' of https://git.royalpay.com.au/git/royalv2.manage into develop
|
9 years ago |
|
eason.qian
|
6df34df759
|
Merge branch 'develop'
# Conflicts:
# src/db/modify.sql
|
9 years ago |
|
eason.qian
|
c4324f1407
|
Merge remote-tracking branch 'origin/master'
|
9 years ago |
|
eason.qian
|
e234e5745f
|
fix 关闭合同提醒
|
9 years ago |
|
eason.qian
|
08426e8a5a
|
fix
|
9 years ago |
|
eason.qian
|
4ac5d4132c
|
Merge remote-tracking branch 'origin/mondelay' into mondelay
|
9 years ago |
|
eason.qian
|
950459e621
|
fix
|
9 years ago |
|
wangning
|
3b593ec9fb
|
Merge branch 'update' into develop
|
9 years ago |
|
wangning
|
4a4e6ad61f
|
update
|
9 years ago |
|
wangning
|
ff4bcc07f5
|
Merge branch 'update' into develop
|
9 years ago |
|
wangning
|
9a5cd5fa85
|
Merge branch 'master' of https://git.royalpay.com.au/git/royalv2.manage
|
9 years ago |
