zhengfangyuan
|
1f627f1313
|
fix bug
|
3 years ago |
zhengfangyuan
|
80fd6e1fef
|
Merge branch 'release_toaliyun_real_202211' of https://git.malls.iformall.com/server/formallProject into release_toaliyun_real_202211
|
3 years ago |
zhengfangyuan
|
263ea368c5
|
fix bug
|
3 years ago |
xhxu
|
bb2123904d
|
//coupon brand
|
3 years ago |
xhxu
|
24c0f87400
|
Merge branch 'release_toaliyun_real_202211' of https://git.malls.iformall.com/server/formallProject into release_toaliyun_real_202211
|
3 years ago |
xhxu
|
272621ee2f
|
//coupon
|
3 years ago |
zhengfangyuan
|
50589b3220
|
fix bug
|
3 years ago |
zhengfangyuan
|
c70d90cbc4
|
Merge branch 'release_toaliyun_real_202211' of https://git.malls.iformall.com/server/formallProject into release_toaliyun_real_202211
|
3 years ago |
zhengfangyuan
|
11c2484879
|
fix bug
|
3 years ago |
xhxu
|
98f6de583c
|
Merge branch 'release_toaliyun_real' of https://git.malls.iformall.com/server/formallProject into release_toaliyun_real_202211
Conflicts:
mallinkService/src/main/java/com/iformall/douyin/web/config/TtWebConstants.java
|
3 years ago |
xhxu
|
0cc60ae060
|
//合同 token
|
3 years ago |
xhxu
|
6db15e8196
|
//web
|
3 years ago |
xhxu
|
ededb6ea49
|
//rent
|
3 years ago |
xhxu
|
f5e08359c5
|
//coupon
|
3 years ago |
xhxu
|
7528f986a9
|
//config
|
3 years ago |
zhengfangyuan
|
3004d754ab
|
fix bug
|
3 years ago |
zhengfangyuan
|
53a24b6499
|
Merge branch 'release_toaliyun_real_202211' of https://git.malls.iformall.com/server/formallProject into release_toaliyun_real_202211
|
3 years ago |
zhengfangyuan
|
0d035e9b79
|
fix plat coupon
|
3 years ago |
xhxu
|
49e4a944ce
|
Merge branch 'release_toaliyun_real_202210' of https://git.malls.iformall.com/server/formallProject into release_toaliyun_real_202211
|
3 years ago |
xhxu
|
8482951210
|
//merchant
|
3 years ago |
xhxu
|
fed09e6cc8
|
//cps
|
3 years ago |
xhxu
|
886eebc581
|
//cps
|
3 years ago |
xhxu
|
f03507461a
|
//coupon
|
3 years ago |
xhxu
|
b8f9494f09
|
Merge branch 'release_toaliyun_real_202211' of https://git.malls.iformall.com/server/formallProject into release_toaliyun_real_202211
Conflicts:
mallinkService/src/main/java/com/iformall/enums/EnumCouponType.java
|
3 years ago |
xhxu
|
26dd8365f6
|
//coupon
|
3 years ago |
zhengfangyuan
|
306f7a6441
|
fix bug
|
3 years ago |
zhengfangyuan
|
8f94ad23f2
|
fix bug
|
3 years ago |
zhengfangyuan
|
aabe7ba215
|
add coupon type
|
3 years ago |
xhxu
|
49bfd4dc3f
|
Merge branch 'release_toaliyun_real_202210' of https://git.malls.iformall.com/server/formallProject into release_toaliyun_real_202210
|
3 years ago |
xhxu
|
d1afb648c2
|
//cuser
|
3 years ago |
xhxu
|
234850518f
|
//coupon
|
3 years ago |
zhengfangyuan
|
a256c2fefc
|
fix bug
|
3 years ago |
zhengfangyuan
|
1aaac40814
|
Merge branch 'release_toaliyun_real_202210' of https://git.malls.iformall.com/server/formallProject into release_toaliyun_real_202210
|
3 years ago |
zhengfangyuan
|
7b83329039
|
fix bug
|
3 years ago |
xhxu
|
ff79215f28
|
Merge branch 'release_toaliyun_real_202210' of https://git.malls.iformall.com/server/formallProject into release_toaliyun_real_202211
|
3 years ago |
xhxu
|
a9a8735ae0
|
//plan
|
3 years ago |
xhxu
|
d1720673b7
|
Merge branch 'release_toaliyun_real_202210' of https://git.malls.iformall.com/server/formallProject into release_toaliyun_real_202210
|
3 years ago |
xhxu
|
baa447de98
|
//plan
|
3 years ago |
zhengfangyuan
|
a77f448b5f
|
fix config
|
3 years ago |
xhxu
|
36e96a13ca
|
Merge branch 'release_toaliyun_real_202210' of https://git.malls.iformall.com/server/formallProject into release_toaliyun_real_202211
|
3 years ago |
xhxu
|
d8b940507e
|
Merge branch 'release_toaliyun_real' of https://git.malls.iformall.com/server/formallProject into release_toaliyun_real_202210
|
3 years ago |
xhxu
|
5510edce9f
|
//微信时间转换
|
3 years ago |
xhxu
|
e09e7d54a3
|
Merge branch 'release_toaliyun_real' of https://git.malls.iformall.com/server/formallProject into release_toaliyun_real_202210
|
3 years ago |
xhxu
|
851bfa94d4
|
//coupon
|
3 years ago |
xhxu
|
a1243df87b
|
//good
|
3 years ago |
xhxu
|
a4d3c8f47f
|
//plan
|
3 years ago |
xhxu
|
51f87adab9
|
//plan
|
3 years ago |
xhxu
|
2de557ab4b
|
//plan
|
3 years ago |
xhxu
|
a26a835d1a
|
Merge branch 'release_toaliyun_real' of https://git.malls.iformall.com/server/formallProject into release_toaliyun_real_202210
|
3 years ago |
xhxu
|
23519ee9e1
|
//msg
|
3 years ago |