Merge branch 'master' of http://218.2.6.10:3001/fanzherong/hunanzeyunew

snowy-plugin/snowy-plugin-biz/src/main/java/vip/xiaonuo/biz/modular/bizappointmentrecord/mapper/mapping/BizAppointmentRecordMapper.xml

@@ -17,7 +17,7 @@
             bar.order_id,
             bo.order_number,
             bo.order_name,
-            bo.order_type,
+            ifnull(bo.order_type,bla.order_type) order_type,
             bc.name customerName,
             bc.contact customerContactName,
             bg.GOODS_NAME goodsName,