Merge branch 'prod' into test

# Conflicts: # cash-service/order-service/src/main/java/com/czg/service/order/print/PrinterImpl.java
2026-05-18 09:52:02 +08:00
parent 0a0f6d53bc 052becc835
commit 24ea4bfc32
4 changed files with 115 additions and 83 deletions
--- a/cash-common/cash-common-service/src/main/java/com/czg/order/dto/OrderInfoPrintDTO.java
+++ b/cash-common/cash-common-service/src/main/java/com/czg/order/dto/OrderInfoPrintDTO.java
@@ -19,6 +19,10 @@ public class OrderInfoPrintDTO implements Serializable {
     */
    @NotNull(message = "id不为空")
    private Long id;
+    /**
+     * 店铺id
+     */
+    private Long shopId;
    /**
     * 1 预结算单
     * 2 结算单