yuan
|
92be3cf81a
|
fix html
|
7 years ago |
wangning
|
7ea1050366
|
update
|
7 years ago |
|
wangning
|
7171a225d8
|
Merge branch 'develop' of https://git.royalpay.com.au/git/royalv2.manage into develop
|
7 years ago |
|
wangning
|
e319db47ef
|
unread add act info
|
7 years ago |
|
yuan
|
f8a17f97e9
|
fix html
|
7 years ago |
|
wangning
|
c4f482af8e
|
Merge branch 'develop' of https://git.royalpay.com.au/git/royalv2.manage into develop
|
7 years ago |
|
wangning
|
808e0b0be5
|
Merge branch 'update' into develop
|
7 years ago |
|
wangning
|
febc6bc5b1
|
adjust merchant QR code
|
7 years ago |
|
yuan
|
1c52f90c33
|
fix html
|
7 years ago |
|
yuan
|
19ebddcfe2
|
fix bug
|
7 years ago |
Tayl0r
|
a82412eae7
|
Revert "[Y] 暂时关闭活动"
This reverts commit 021386f
|
7 years ago |
|
Tayl0r
|
021386fd5c
|
[Y] 暂时关闭活动
|
7 years ago |
yixian
|
28933de278
|
代码优化
|
7 years ago |
eason.qian
|
1c3ace6ffd
|
Merge remote-tracking branch 'origin/develop' into develop
|
7 years ago |
|
eason.qian
|
2c0a360ddd
|
Merge branch 'mondelay' into develop
|
7 years ago |
|
yuan
|
bad6e6aebd
|
修改页面
|
7 years ago |
|
yuan
|
6dbad697c4
|
Merge remote-tracking branch 'origin/mondelay' into mondelay
|
7 years ago |
|
wangning
|
43ed9074c1
|
Merge branch 'develop' of https://git.royalpay.com.au/git/royalv2.manage into develop
|
7 years ago |
|
wangning
|
1f112c19f7
|
fixbug
|
7 years ago |
|
eason.qian
|
6125d8b0f2
|
Merge remote-tracking branch 'origin/develop' into develop
|
7 years ago |
|
eason.qian
|
9e6b60de72
|
fix
|
7 years ago |
|
wangning
|
9bc84b33a8
|
fixbug
|
7 years ago |
|
yuan
|
9ffb7c4bd1
|
显示规则
|
7 years ago |
|
eason.qian
|
b49f43c3bb
|
Merge branch 'mondelay' into develop
|
7 years ago |
|
eason.qian
|
9ac5b10c0b
|
Merge remote-tracking branch 'origin/mondelay' into mondelay
|
7 years ago |
|
eason.qian
|
df70c356c6
|
fix
|
7 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
|
7 years ago |
|
yuan
|
6daca4a0a9
|
Merge remote-tracking branch 'origin/mondelay' into mondelay
|
7 years ago |
|
yuan
|
68be8297b0
|
fix~
|
7 years ago |
|
eason.qian
|
52b844cc8a
|
Merge branch 'mondelay' into develop
|
7 years ago |
|
eason.qian
|
b7459efc5b
|
fix
|
7 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
|
7 years ago |
|
eason.qian
|
a887493153
|
fix
|
7 years ago |
|
eason.qian
|
1e984e8e68
|
fix
|
7 years ago |
|
yuan
|
42ea3adcd7
|
fix~
|
7 years ago |
|
eason.qian
|
f63f6bc001
|
fix
|
7 years ago |
|
eason.qian
|
ca1c61d666
|
fix
|
7 years ago |
|
wangning
|
e8076ea45d
|
Merge branch 'hotfix_contract' into develop
|
7 years ago |
|
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 |
