From f650319d7175f764cd5286c383a72d6e6d2e8a87 Mon Sep 17 00:00:00 2001
From: MrShi <1878285526@qq.com>
Date: 星期五, 18 七月 2025 14:53:18 +0800
Subject: [PATCH] 调接口

---
 small-program/unpackage/dist/dev/mp-weixin/pages/using-workers/using-workers.js |    4 ----
 1 files changed, 0 insertions(+), 4 deletions(-)

diff --git a/small-program/unpackage/dist/dev/mp-weixin/pages/using-workers/using-workers.js b/small-program/unpackage/dist/dev/mp-weixin/pages/using-workers/using-workers.js
index 524d044..01869d6 100644
--- a/small-program/unpackage/dist/dev/mp-weixin/pages/using-workers/using-workers.js
+++ b/small-program/unpackage/dist/dev/mp-weixin/pages/using-workers/using-workers.js
@@ -109,11 +109,7 @@
       return Promise.all(/*! import() | node-modules/uview-ui/components/u-calendar/u-calendar */[__webpack_require__.e("common/vendor"), __webpack_require__.e("node-modules/uview-ui/components/u-calendar/u-calendar")]).then(__webpack_require__.bind(null, /*! uview-ui/components/u-calendar/u-calendar.vue */ 396))
     },
     uPicker: function () {
-<<<<<<< HEAD
       return Promise.all(/*! import() | node-modules/uview-ui/components/u-picker/u-picker */[__webpack_require__.e("common/vendor"), __webpack_require__.e("node-modules/uview-ui/components/u-picker/u-picker")]).then(__webpack_require__.bind(null, /*! uview-ui/components/u-picker/u-picker.vue */ 423))
-=======
-      return Promise.all(/*! import() | node-modules/uview-ui/components/u-picker/u-picker */[__webpack_require__.e("common/vendor"), __webpack_require__.e("node-modules/uview-ui/components/u-picker/u-picker")]).then(__webpack_require__.bind(null, /*! uview-ui/components/u-picker/u-picker.vue */ 553))
->>>>>>> bbd9c436f23f5fdbe712c4a22d90b457066bdf38
     },
   }
 } catch (e) {

--
Gitblit v1.9.3