Commit e0a0bb53 by zhangleyuan

feat:解决合并代码后的冲突

parent ce71a5b6
import React from 'react'; import React from 'react';
import { Modal, message } from 'antd'; import { Modal, message,Button} from 'antd';
import html2canvas from 'html2canvas'; import html2canvas from 'html2canvas';
import User from "../../../common/js/user"; import User from "../../../common/js/user";
import QRCode from '../../../libs/qrcode/qrcode'; import QRCode from '../../../libs/qrcode/qrcode';
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment