fix

src/business/platform/data/templaterender/templates/list.vue

@@ -192,12 +192,8 @@ export default {
     IbpsAddress,
     IbpsImage,
     DictionaryFormat,
-<<<<<<< Updated upstream
     Scan,
     Print: () => import('../components/print')
-=======
-    Scan
->>>>>>> Stashed changes
     // BpmnFormrender
     // DataTemplateFormat
   },