Merge remote-tracking branch 'origin/master'

于杰

2025-08-11 ba4f03556d24a1548de75c8219cbc3f06e4ff57c

 north-glass-erp/src/main/java/com/example/erp/service/pp/FlowCardService.java

@@ -693,7 +693,7 @@
                                flowCard.getOrderNumber(), flowCard.getPrintQuantity()
                        ));
                    } else {

                            //用于天津现场流程卡打印界面的小片标签打印
                        itemmap.put("data", flowCardMapper.getPrintCustomDataSemiTj(
                                flowCard.getProcessId(),
                                flowCard.getTechnologyNumber(),