Merge remote-tracking branch 'origin/dev' into dev

zxl

4 天以前 c9928dd4f6d25e2339ea1400f59ec58674a927a7

 pages/product/product/promotion/-promotion-assemble-promotions.vue

@@ -109,7 +109,8 @@
</template>

<script>
import '@/uview-components/uview-ui'
import '@/components/uview-components/uview-ui';

export default {
  data() {
    return {};