Merge branch 'master' into groupmealweb

src/pages/database/goods/goodstechnology/components/goodstechnologymaken.jsx

@@ -472,7 +472,7 @@ const goodstechnologymaken = (props) => {
               goodstechnolog == undefined ? '' : (
                 goodstechnolog.map((x, index) => {
                   return (
-                    <ProCard wrap gutter={16} boxShadow title={x.deviceName+'【'+attrvalue+'】'} bodyStyle={{ padding: 0,'overflow-x': 'scrol'}} headStyle={{ padding: '0px 0px', backgroundColor: 'burlywood', paddingLeft: '40%', height: 45 }} extra={[
+                    <ProCard wrap gutter={16} boxShadow title={x.deviceName} bodyStyle={{ padding: 0,'overflow-x': 'scrol'}} headStyle={{ padding: '0px 0px', backgroundColor: 'burlywood', paddingLeft: '40%', height: 45 }} extra={[
                       <FormOutlined style={{ marginRight: 10 }} onClick={(e) => { onClickedit(e, x) }} />,
                       // <DeleteOutlined style={{ marginRight: 6 }} onClick={(e) => { onClickDevicedele(e, x.deviceId) }} />,
                       <Popconfirm