Merge branch 'projects/mescc/develop' into projects/mescc/lb

1
update main.js
2024-04-19 09:18:10 +08:00 · 2024-04-19 09:16:35 +08:00 · 2024-04-19 09:07:39 +08:00 · 2024-04-18 17:39:04 +08:00
2 changed files with 6 additions and 1 deletions
--- a/src/main.js
+++ b/src/main.js
@ -41,7 +41,7 @@ import {
  getDictDatas,
  getDictDatas2,
 } from "@/utils/dict";
-
+import CodeBrickZj from 'code-brick-zj';
 import "./theme/index.css"; // 自定义主题包 - code-brick-zj

 // 全局方法挂载
--- a/yarn.lock
+++ b/yarn.lock
@ -3141,6 +3141,11 @@
    "chalk" "^2.4.1"
    "q" "^1.1.2"

+"code-brick-zj@^1.1.0":
+  "integrity" "sha512-J6S5ILHdweYMiEfpLuU8EvgQNEJ4EMAvjBAbLRtpGOBtXNX4U7z+IB9jDu2FE1TdkOaKJUpVLubgZwxkGzXNaA=="
+  "resolved" "https://registry.npmmirror.com/code-brick-zj/-/code-brick-zj-1.1.0.tgz"
+  "version" "1.1.0"
+
 "collection-visit@^1.0.0":
  "integrity" "sha512-lNkKvzEeMBBjUGHZ+q6z9pSJla0KWAQPvtzhEV9+iGyQYG+pBpl7xKDhxoNSOZH2hhv0v5k0y2yAM4o4SjoSkw=="
  "resolved" "https://registry.npmmirror.com/collection-visit/-/collection-visit-1.0.0.tgz"
Author	SHA1	Message	Date
$DESKTOP-FUDKNA8\znjsz$ DESKTOP-FUDKNA8\znjsz	bd0faef33f	Merge branch 'projects/mescc/develop' into projects/mescc/lb	2024-04-19 09:18:10 +08:00
$DESKTOP-FUDKNA8\znjsz$ DESKTOP-FUDKNA8\znjsz	eb8c7bbfe4	1	2024-04-19 09:16:35 +08:00
$DESKTOP-FUDKNA8\znjsz$ DESKTOP-FUDKNA8\znjsz	d55dc7899f	update main.js	2024-04-19 09:07:39 +08:00
juzi	fa80816a1f	Merge pull request '首页数据对接完成' (#4 ) from projects/mescc/lb into projects/mescc/develop Reviewed-on: #4	2024-04-18 17:39:04 +08:00