zcloud_gbs
/
zcloud-gbs-accident-react
14
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master' 

# Conflicts:
#	jjb.config.js
#	package.json
master
fangjiakai 2026-03-11 15:45:22 +08:00
parent ed38e8c510 1a09e5e8c7
commit acf96ba96d
2 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
package.json
View File

@ -30,12 +30,12 @@
"lodash-es": "^4.17.21", "lodash-es": "^4.17.21",
"react": "^18.2.0", "react": "^18.2.0",
"react-dom": "^18.2.0", "react-dom": "^18.2.0",
"zy-react-library": "^1.2.3" "zy-react-library": "^1.2.4"
}, },
"devDependencies": { "devDependencies": {
"@antfu/eslint-config": "^5.4.1", "@antfu/eslint-config": "^5.4.1",
"@babel/plugin-proposal-decorators": "^7.19.3", "@babel/plugin-proposal-decorators": "^7.19.3",
"@cqsjjb/scripts": "latest", "@cqsjjb/scripts": "2.0.0-alpha-1",
"@eslint-react/eslint-plugin": "^2.2.2", "@eslint-react/eslint-plugin": "^2.2.2",
"cross-env": "^7.0.3", "cross-env": "^7.0.3",
"eslint": "^9.37.0", "eslint": "^9.37.0",

2
src/main.js
View File

@ -5,12 +5,14 @@ import { message } from "antd";
import dayjs from "dayjs"; import dayjs from "dayjs";
import "dayjs/locale/zh-cn"; import "dayjs/locale/zh-cn";
import "../blessed_by_buddha"; import "../blessed_by_buddha";
import { getFileUrlFromServer } from "zy-react-library/utils";
getFileUrlFromServer(); getFileUrlFromServer();
require("antd/dist/reset.css"); require("antd/dist/reset.css");
require("zy-react-library/css/common.less"); require("zy-react-library/css/common.less");
dayjs.locale("zh-cn"); dayjs.locale("zh-cn");
setJJBCommonAntdMessage(message); setJJBCommonAntdMessage(message);
getFileUrlFromServer();
const app = setup(); const app = setup();