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

src/main/java/com/glxp/api/controller/basic/BasicOrderPrintController.java

@@ -196,6 +196,7 @@ public class BasicOrderPrintController {
                     bizData.put("manufactor", ioOrderDetailBizEntity.getManufacturer());
                     bizData.put("zczbhhzbapzbh", ioOrderDetailBizEntity.getCertCode() == null ? ' ' : ioOrderDetailBizEntity.getCertCode());
                     bizData.put("ylqxzcrbarmc", udiProductEntity.getYlqxzcrbarmc() == null ? ' ' : udiProductEntity.getYlqxzcrbarmc());
+                    bizData.put("fromSpmsOrders", ioOrderResponse.getFromSpmsOrders() == null ? ' ' : ioOrderResponse.getFromSpmsOrders());
 //                    bizData.put("cplb", udiProductEntity.getCplb() == null ? ' ' : udiProductEntity.getCplb());
 //                    if(ioOrderInvoiceResponses != null && ioOrderInvoiceResponses.size()>0){
 //                        String encode="";