Pull request #3432: KERNEL-14124 fix: 打包fineui.min.js需要吧_和$挂载到全局

Merge in VISUAL/fineui from ~ZHENFEI.LI/fineui:es6 to es6

* commit '4d54586c4b8de53a485f05c43cc88e817842a7ba':
  KERNEL-14124 fix: 打包fineui.min.js需要吧_和$挂载到全局

webpack/attachments.js

@@ -21,6 +21,7 @@ const basicAttachmentMap = {
         lodashJs,
         jqueryJs,
         popperJs,
+        "src/core/conflict.js",
         "src/bundle.js",
         // "src/core/**/*.js",
         // "src/data/**/*.js",