# Conflicts: # apps/web-antd/src/views/mall/promotion/point/activity/data.ts # apps/web-antd/src/views/mall/promotion/point/activity/index.vue |
||
|---|---|---|
| .. | ||
| backend-mock | ||
| web-antd | ||
| web-ele | ||
| web-naive | ||
# Conflicts: # apps/web-antd/src/views/mall/promotion/point/activity/data.ts # apps/web-antd/src/views/mall/promotion/point/activity/index.vue |
||
|---|---|---|
| .. | ||
| backend-mock | ||
| web-antd | ||
| web-ele | ||
| web-naive | ||