Commit Graph

18 Commits

Author SHA1 Message Date
aixianling
a5dbdbe778 Merge branch 'dev' into vite
# Conflicts:
#	examples/router/autoRoutes.js
#	package.json
#	packages/bigscreen/designer/components/Add.vue
#	project/dv/apps/AppGridDV.vue
#	vue.config.js
2022-08-23 11:14:38 +08:00
liuye
6561f31e2d css 2022-08-23 08:58:46 +08:00
yanran200730
b52c178051 bug 2022-08-22 17:06:11 +08:00
liuye
41810a8b80 宣发统计 2022-08-22 15:03:55 +08:00
liuye
fbfa584d55 30710 2022-08-22 11:30:27 +08:00
liuye
2d834a57d5 宣发统计 2022-08-22 10:44:41 +08:00
yanran200730
8aae3b84a5 bug 2022-08-18 18:33:01 +08:00
yanran200730
49bd61c376 bug 2022-08-18 18:24:59 +08:00
yanran200730
dd81c894e0 协同宣发 2022-08-18 17:14:11 +08:00
yanran200730
154506ec6e 协同宣发 2022-08-18 09:40:09 +08:00
aixianling
da8e8f0d65 Merge branch 'dev' into vite
# Conflicts:
#	examples/main.js
#	examples/router/autoRoutes.js
#	package.json
#	packages/bigscreen/designer/AppDesigner.vue
#	packages/bigscreen/designer/components/Add.vue
#	packages/bigscreen/designer/components/Layout.vue
#	packages/bigscreen/designer/components/List.vue
#	packages/bigscreen/designer/components/SourceData.vue
#	packages/bigscreen/designer/components/form/DataConfig.vue
#	packages/bigscreen/designer/config.js
#	packages/bigscreen/viewer/AppGigscreenViewer.vue
#	packages/conv/creditScore/scoreManage/scoreChange.vue
#	packages/index.js
#	project/dv/apps/AppGridDV.vue
#	project/dvui/components/AiMonitor/dhVideo.vue
#	project/dvui/components/AiSwiper.vue
#	project/dvui/layout/AiDvBackground.vue
#	project/dvui/layout/AiDvSummary/AiDvSummary.vue
#	project/dvui/layout/AiDvWrapper/AiDvWrapper.vue
#	project/dvui/package.json
#	public/index.html
#	vue.config.js
2022-07-07 09:01:40 +08:00
shijingjing
d021781d75 经办人 2022-06-28 16:05:19 +08:00
shijingjing
6eb7b5d13d 30377 2022-06-28 10:36:31 +08:00
liuye
b9964d64b0 fix 2022-06-28 09:15:10 +08:00
liuye
6896dfd197 fix 2022-06-28 09:14:39 +08:00
liuye
79c6636fb2 话术库bug 2022-05-18 10:02:15 +08:00
aixianling
e91d1f73dc Merge branch 'dev' into vite
# Conflicts:
#	examples/App.vue
#	examples/router/autoRoutes.js
#	examples/utils/index.js
#	package.json
#	packages/wechat/AppProjectActivities/components/Event.vue
#	project/dv/apps/AppHomesteadDV.vue
#	vue.config.js
2022-05-10 20:06:15 +08:00
aixianling
036ee91533 目录代码整合 2022-05-10 20:02:37 +08:00