Merge branch 'master' into groupmealweb

src/pages/device/technology/index.jsx

@@ -287,7 +287,8 @@ const GoodsTypeManage = () => {
         </FooterToolbar>
       )}
       <Modal title="上传工艺模版" open={isModalOpen} footer={null} maskClosable={false}
-      destroyOnClose onCancel={() => { setDeviceVesionData();setIsModalOpen(false) }}>
+      destroyOnClose onCancel={() => { setDeviceVesionData();setdeviceTypeKey("");
+      setProductVesionId('');setIsModalOpen(false) }}>
         <div style={{marginBottom:10}}>
             <span style={{marginRight:10}}>选择产品</span>
             <Select style={{width: '60%'}} onChange={handleChange}>