Merge branch 'product-kk' into product

package-lock.json

@@ -22420,13 +22420,8 @@
     },
     "vue-slider-component": {
       "version": "3.1.5",
-<<<<<<< HEAD
-      "resolved": "https://registry.npmjs.org/vue-slider-component/-/vue-slider-component-3.1.5.tgz",
-      "integrity": "sha512-RIDL2cjIfSMKxv7IeNQ5gn936SAaLi+UKc97xd8yN92zz0n5dK343GGSay/3ypzhR1C5YIN3n7/LclUQrIDoFg==",
-=======
       "resolved": "https://registry.npm.taobao.org/vue-slider-component/download/vue-slider-component-3.1.5.tgz?cache=0&sync_timestamp=1590980161427&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fvue-slider-component%2Fdownload%2Fvue-slider-component-3.1.5.tgz",
       "integrity": "sha1-2a1vGhBcigp7cvW4+VZW0HuOTDY=",
->>>>>>> 07734a85a7ff7845f4f995bf7879d342b5bda7d3
       "requires": {
         "core-js": "^3.6.5",
         "vue-property-decorator": "^8.0.0"
@@ -22434,13 +22429,8 @@
       "dependencies": {
         "core-js": {
           "version": "3.6.5",
-<<<<<<< HEAD
-          "resolved": "https://registry.npmjs.org/core-js/-/core-js-3.6.5.tgz",
-          "integrity": "sha512-vZVEEwZoIsI+vPEuoF9Iqf5H7/M3eeQqWlQnYa8FSKKePuYTf5MWnxb5SDAzCa60b3JBRS5g9b+Dq7b1y/RCrA=="
-=======
           "resolved": "https://registry.npm.taobao.org/core-js/download/core-js-3.6.5.tgz",
           "integrity": "sha1-c5XcJzrzf7LlDpvT2f6EEoUjHRo="
->>>>>>> 07734a85a7ff7845f4f995bf7879d342b5bda7d3
         }
       }
     },