Merge remote-tracking branch 'origin/master'

2025-02-24 14:10:50 +08:00
parent 2d8f120303 010efabd05
commit 9ef904c915
4 changed files with 17 additions and 2 deletions
--- a/cash-common/cash-common-service/src/main/java/com/czg/account/entity/PrintMachine.java
+++ b/cash-common/cash-common-service/src/main/java/com/czg/account/entity/PrintMachine.java
@@ -66,7 +66,7 @@ public class PrintMachine implements Serializable {
    /**
     * 店铺Id
     */
-    private String shopId;
+    private Long shopId;

    /**
     * 分类Id