Merge remote-tracking branch 'origin/master'
# Conflicts: # jjb.config.js # package.jsonmaster
commit
acf96ba96d
|
|
@ -30,12 +30,12 @@
|
|||
"lodash-es": "^4.17.21",
|
||||
"react": "^18.2.0",
|
||||
"react-dom": "^18.2.0",
|
||||
"zy-react-library": "^1.2.3"
|
||||
"zy-react-library": "^1.2.4"
|
||||
},
|
||||
"devDependencies": {
|
||||
"@antfu/eslint-config": "^5.4.1",
|
||||
"@babel/plugin-proposal-decorators": "^7.19.3",
|
||||
"@cqsjjb/scripts": "latest",
|
||||
"@cqsjjb/scripts": "2.0.0-alpha-1",
|
||||
"@eslint-react/eslint-plugin": "^2.2.2",
|
||||
"cross-env": "^7.0.3",
|
||||
"eslint": "^9.37.0",
|
||||
|
|
|
|||
|
|
@ -5,12 +5,14 @@ import { message } from "antd";
|
|||
import dayjs from "dayjs";
|
||||
import "dayjs/locale/zh-cn";
|
||||
import "../blessed_by_buddha";
|
||||
import { getFileUrlFromServer } from "zy-react-library/utils";
|
||||
|
||||
getFileUrlFromServer();
|
||||
require("antd/dist/reset.css");
|
||||
require("zy-react-library/css/common.less");
|
||||
dayjs.locale("zh-cn");
|
||||
setJJBCommonAntdMessage(message);
|
||||
getFileUrlFromServer();
|
||||
|
||||
const app = setup();
|
||||
|
||||
|
|
|
|||
Loading…
Reference in New Issue