Commit 89a9085b8fcdaf492e978262554dc339a0e27b92

Authored by loveumiko
1 parent 09ddf035

fix: 合并冲突的代码

@@ -155,7 +155,6 @@ @@ -155,7 +155,6 @@
155 handleOpenGatewayDevice, 155 handleOpenGatewayDevice,
156 isTransportType, 156 isTransportType,
157 drawerTitle, 157 drawerTitle,
158 - f684ffd1d4d63f0a1bca741c749ccea02faf7015,  
159 }; 158 };
160 }, 159 },
161 }); 160 });
@@ -90,7 +90,6 @@ @@ -90,7 +90,6 @@
90 editOrAddDeviceTypeStatus, 90 editOrAddDeviceTypeStatus,
91 getFieldsValue, 91 getFieldsValue,
92 setFieldsdefaultRuleChainId, 92 setFieldsdefaultRuleChainId,
93 - f684ffd1d4d63f0a1bca741c749ccea02faf7015,  
94 }); 93 });
95 </script> 94 </script>
96 <style lang="less" scoped> 95 <style lang="less" scoped>