Merge branch 'igirl-channel' of gitlab.gongsibao.com:jiangyong/zhichan into igirl-channel

igirl-channel/app/base/service/impl/dborder/ordertmproductSve.js

@@ -898,10 +898,11 @@ class OrderTmProductService extends ServiceBase {
       if (beforeOtp && beforeOtp.id) {//更新交付单
         orderProductObj["id"] = beforeOtp.id;
         await self.dao.update(orderProductObj, t);
-        orderTm = await self.ordertmproductDao.model.findOne({
-          where: { id: beforeOtp.id },
-          raw: true
-        });
+        // orderTm = await self.ordertmproductDao.model.findOne({
+        //   where: { id: beforeOtp.id },
+        //   raw: true
+        // });
+        orderTm=orderProductObj;
       } else {//创建服务单
         orderTm = await self.dao.create(orderProductObj, t);//创建商标订单
       }