 liujunchi
|
776934254c
Merge branch 'dev_v1.3.4_20220909'
|
3 years ago |
|
liujunchi
|
f9cf49d9c4
fix:时间精度丢失
|
3 years ago |
 yonge
|
3037f51932
Merge branch 'online'
|
3 years ago |
|
yonge
|
d8086d2354
update
|
3 years ago |
 Eric
|
db99668a65
Merge branch 'dev_v1.3.4_20220909' into dev_v1.3.4_20220914
|
3 years ago |
|
yonge
|
8948f88d1f
Merge branch 'online'
|
3 years ago |
|
yonge
|
490e1d8b5f
update
|
3 years ago |
|
liujunchi
|
3f40967ff4
Merge branch 'dev_v1.3.4_20220909'
|
3 years ago |
|
liujunchi
|
fa0be134a0
fix:time
|
3 years ago |
|
liujunchi
|
f6a2ade83d
Merge branch 'dev_v1.3.4_20220909'
|
3 years ago |
|
liujunchi
|
95bcd525e8
fix:优惠券发放时间
|
3 years ago |
|
Eric
|
dc6b580b9f
Merge branch 'dev_v1.3.4_20220909' into dev_v1.3.4_20220914
|
3 years ago |
|
Eric
|
6ec84d30c5
Merge branch 'dev_v1.3.4_20220909'
|
3 years ago |
|
Eric
|
89585ef5f0
更新曲目获奖排名计算
|
3 years ago |
|
Eric
|
c2b55e9112
Merge branch 'dev_v1.3.4_20220909' into dev_v1.3.4_20220914
|
3 years ago |
|
Eric
|
7e81ddd819
Merge branch 'dev_v1.3.4_20220909'
|
3 years ago |
|
Eric
|
71715986bc
Merge branch 'dev_v1.3.4_20220909' of http://git.dayaedu.com/yonge/cooleshow into dev_v1.3.4_20220909
|
3 years ago |
|
Eric
|
fee00a104e
修复奖品关联优惠券逻辑
|
3 years ago |
|
yonge
|
9f2daa753f
Merge branch 'online'
|
3 years ago |
|
yonge
|
1f89c6f634
update
|
3 years ago |
|
liujunchi
|
a88a3d1028
Merge branch 'dev_v1.3.4_20220909'
|
3 years ago |
|
liujunchi
|
069abec3f0
fix:默认发奖失败
|
3 years ago |
|
liujunchi
|
22d39ea110
Merge branch 'dev_v1.3.4_20220909'
|
3 years ago |
|
liujunchi
|
e83948e2d4
fix:优惠券备注
|
3 years ago |
|
liujunchi
|
a687ce8747
fix:merge
|
3 years ago |
|
liujunchi
|
e9389b9640
fix:发券类型
|
3 years ago |
|
yonge
|
bd86655bbc
Merge branch 'online'
|
3 years ago |
|
yonge
|
48acd61408
update
|
3 years ago |
|
Eric
|
dca4830d00
Merge branch 'dev_v1.3.4_20220909'
|
3 years ago |
|
Eric
|
4255ab2b80
解决代码合并功能被删除
|
3 years ago |
