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

# Conflicts: # src/main/java/com/chaozhanggui/system/cashierservice/entity/TbShopInfo.java # src/main/java/com/chaozhanggui/system/cashierservice/util/RandomUtil.java
2024-04-15 15:24:23 +08:00
parent ca1cdd545c c84b9cc152
commit 60fc45a65e
2 changed files with 24 additions and 20 deletions
--- a/src/main/java/com/chaozhanggui/system/cashierservice/entity/TbShopInfo.java
+++ b/src/main/java/com/chaozhanggui/system/cashierservice/entity/TbShopInfo.java
@@ -105,4 +105,6 @@ public class TbShopInfo implements Serializable {
     */
    private String tag;

+    private static final long serialVersionUID = 1L;
+
 }