合并冲突

licp

2024-04-29 ea1a8cf41c11f8f533cea594e1f1c03640cf4a96

 src/views/plan/customerorder/customerorder-return.vue

@@ -82,7 +82,6 @@
        this.customerOrderList.forEach((item) => {
          ids.push(item.id)
        })
        console.log('this.userInfo.username', this.userInfo.username)
        const setDataForm = {
          customerOrderIds: ids,
          returnUser: this.userInfo.staffName,