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

src/main/java/com/chaozhanggui/system/cashierservice/entity/TbShopUser.java

@@ -2,6 +2,7 @@ package com.chaozhanggui.system.cashierservice.entity;
 
 import java.io.Serializable;
 import java.math.BigDecimal;
+import java.util.Date;
 
 public class    TbShopUser implements Serializable {
     private Integer id;
@@ -61,6 +62,7 @@ public class    TbShopUser implements Serializable {
     private Long updatedAt;
 
     private String miniOpenId;
+    private Date joinTime;
 
     private static final long serialVersionUID = 1L;
 
@@ -295,4 +297,12 @@ public class    TbShopUser implements Serializable {
     public void setDynamicCode(String dynamicCode) {
         this.dynamicCode = dynamicCode;
     }
+
+    public Date getJoinTime() {
+        return joinTime;
+    }
+
+    public void setJoinTime(Date joinTime) {
+        this.joinTime = joinTime;
+    }
 }

src/main/java/com/chaozhanggui/system/cashierservice/entity/dto/ShopPrinterDTO.java

@@ -0,0 +1,64 @@
+package com.chaozhanggui.system.cashierservice.entity.dto;
+
+import lombok.Data;
+
+import java.io.Serializable;
+import java.text.SimpleDateFormat;
+import java.util.Date;
+
+/**
+ * 店铺打印机配置
+ *
+ * @author tankaikai
+ * @since 2024-09-24 17:13
+ */
+@Data
+public class ShopPrinterDTO implements Serializable {
+    private static final long serialVersionUID = 1L;
+
+    private Integer id;
+
+    private String name;
+
+    private String type;
+
+    private String connectionType;
+
+    private String address;
+
+    private String port;
+
+    private String subType;
+
+    private Integer status;
+
+    private String shopId;
+
+    private String categoryIds;
+
+    private String contentType;
+
+    private String createdAt;
+
+    private String updatedAt;
+
+    private Integer sort;
+
+    private String vendorId;
+
+    private String productId;
+    private String config;
+
+    public String getCreatedAt() {
+        SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+        return sdf.format(new Date(Long.valueOf(createdAt)));
+    }
+
+    public String getUpdatedAt() {
+        if("".equals(updatedAt) || updatedAt == null){
+            return "";
+        }
+        SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+        return sdf.format(new Date(Long.valueOf(updatedAt)));
+    }
+}