 baicha
|
c0d9425e9c
fix:合并代码解决冲突
|
2 years ago |
|
baicha
|
34799576b1
Merge branch 'timi-dev-0.7.0' of http://code.juwan-inc.com/juwan/wheat/starbuds-web/platform-manage into bc/dev
|
2 years ago |
 wuji
|
ace0dbbd68
Merge branch 'wj/0.5.0' into timi-dev-0.7.0
|
2 years ago |
|
baicha
|
a97689d7f5
Merge branch 'wj/0.5.0' of http://code.juwan-inc.com/juwan/wheat/starbuds-web/platform-manage into bc/dev
|
2 years ago |
|
baicha
|
40c1b9dedf
Merge branch 'timi-dev-test' of http://code.juwan-inc.com/juwan/wheat/starbuds-web/platform-manage into timi-dev-test
|
2 years ago |
|
baicha
|
5c9851be44
Merge branch 'bc/dev' into timi-dev-test
|
2 years ago |
|
baicha
|
de3d79dae4
fix:添加勋章卡
|
2 years ago |
|
wuji
|
e81ad067b0
Merge branch 'wj/0.5.0' into timi-dev-test
|
2 years ago |
|
wuji
|
042673e9d2
修改赠送礼物非必填
|
2 years ago |
 陆离
|
c1fd390930
fix:修改字段
|
2 years ago |
|
陆离
|
4609b6f441
fix:修改默认时间段
|
2 years ago |
|
陆离
|
bd8d4db24e
fix:需求修改
|
2 years ago |
|
wuji
|
5d07448dea
Merge branch 'wj/0.5.0' into timi-dev-test
|
2 years ago |
|
wuji
|
1f897855fb
修复删除刷新
|
2 years ago |
|
wuji
|
1c6e5fe60e
Merge branch 'wj/0.5.0' into timi-dev-test
|
2 years ago |
|
wuji
|
fda317057c
解除弹窗通知必填
|
2 years ago |
|
baicha
|
3b91bc43b1
Merge branch 'timi-dev-test' of http://code.juwan-inc.com/juwan/wheat/starbuds-web/platform-manage into timi-dev-test
|
2 years ago |
|
baicha
|
0c0f2476fa
Merge branch 'bc/dev' into timi-dev-test
|
2 years ago |
|
陆离
|
609b972ae6
Merge branch 'luli/2.4.0' into timi-dev-test
|
2 years ago |
|
陆离
|
d493c80dd2
fix:联调餐叉接口
|
2 years ago |
|
wuji
|
c277c4ef46
Merge branch 'wj/0.5.0' into timi-dev-test
|
2 years ago |
|
wuji
|
ec7a7caf89
修改规则消耗数量
|
2 years ago |
|
陆离
|
cff6ed0d68
fix:修改按钮详情
|
2 years ago |
|
baicha
|
9763761973
fix:合并代码
|
2 years ago |
|
baicha
|
ea42b9be47
魅力花房活动添加字段
|
2 years ago |
|
陆离
|
653784490f
fix：合并代码
|
2 years ago |
|
陆离
|
a6919cdc42
Merge branch 'timi-dev-test' of http://code.juwan-inc.com/juwan/wheat/starbuds-web/platform-manage into timi-dev-test
|
2 years ago |
|
陆离
|
49180ef6b8
Merge branch 'luli/2.4.0' into timi-dev-test
|
2 years ago |
|
陆离
|
c40faaec5f
fix:修改老粉回归日期格式
|
2 years ago |
|
wuji
|
134f94c810
Merge branch 'timi-dev-test' of https://code.juwan-inc.com/juwan/wheat/starbuds-web/platform-manage into timi-dev-test
|
2 years ago |
