From b8fa0fa65e994fb0a7067e3348ee8604db815a9b Mon Sep 17 00:00:00 2001
From: xuxj <hugeinfo123>
Date: Sun, 26 Apr 2020 09:43:14 +0800
Subject: [PATCH] Merge branch 'master' of http://git.hugeinfo.com.cn/r/nsjcy/frontEnd/nsjcy

---
 SunshineLnsMinApp/templeteDist/wuxDist/helpers/mergeOptionsToData.js |    1 +
 1 files changed, 1 insertions(+), 0 deletions(-)

diff --git a/SunshineLnsMinApp/templeteDist/wuxDist/helpers/mergeOptionsToData.js b/SunshineLnsMinApp/templeteDist/wuxDist/helpers/mergeOptionsToData.js
new file mode 100644
index 0000000..dc935cc
--- /dev/null
+++ b/SunshineLnsMinApp/templeteDist/wuxDist/helpers/mergeOptionsToData.js
@@ -0,0 +1 @@
+"use strict";Object.defineProperty(exports,"__esModule",{value:!0}),exports.default=void 0;var mergeOptionsToData=function(e){var t=0<arguments.length&&void 0!==e?e:{},o=Object.assign({},t);for(var r in o)o.hasOwnProperty(r)&&"function"==typeof o[r]&&delete o[r];return o},_default=mergeOptionsToData;exports.default=_default;
\ No newline at end of file

--
Gitblit v1.8.0