From d230123480899cd37d7cd68024bb93bbf068d721 Mon Sep 17 00:00:00 2001
From: pjb <123456>
Date: 星期二, 17 六月 2025 20:31:48 +0800
Subject: [PATCH] Merge branch 'ycds-wms-dev' of http://47.97.1.152:5880/r/zy-asrs-master into ycds-wms-dev
---
zy-asrs-wms/src/main/java/com/zy/asrs/wms/system/license/entity/license/LicenseCreatorParam.java | 192 ++++++++++++++++++++++++------------------------
1 files changed, 96 insertions(+), 96 deletions(-)
diff --git a/zy-asrs-wms/src/main/java/com/zy/asrs/wms/system/license/entity/license/LicenseCreatorParam.java b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/system/license/entity/license/LicenseCreatorParam.java
index da5477f..75c04c9 100644
--- a/zy-asrs-wms/src/main/java/com/zy/asrs/wms/system/license/entity/license/LicenseCreatorParam.java
+++ b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/system/license/entity/license/LicenseCreatorParam.java
@@ -1,96 +1,96 @@
-package com.zy.asrs.wms.system.license.entity.license;
-
-import com.fasterxml.jackson.annotation.JsonFormat;
-import lombok.Data;
-
-import java.io.Serializable;
-import java.util.Date;
-
-/**
- * License鐢熸垚绫婚渶瑕佺殑鍙傛暟
- */
-@Data
-public class LicenseCreatorParam implements Serializable {
-
- private static final long serialVersionUID = -7793154252684580872L;
- /**
- * 璇佷功subject
- */
- private String subject;
-
- /**
- * 瀵嗛挜鍒О
- */
- private String privateAlias;
-
- /**
- * 瀵嗛挜瀵嗙爜锛堥渶瑕佸Ε鍠勪繚绠★紝涓嶈兘璁╀娇鐢ㄨ�呯煡閬擄級
- */
- private String keyPass;
-
- /**
- * 璁块棶绉橀挜搴撶殑瀵嗙爜
- */
- private String storePass;
-
- /**
- * 璇佷功鐢熸垚璺緞
- */
- private String licensePath;
-
- /**
- * 瀵嗛挜搴撳瓨鍌ㄨ矾寰�
- */
- private String privateKeysStorePath;
-
- /**
- * 璇佷功鐢熸晥鏃堕棿
- */
- @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
- private Date issuedTime = new Date();
-
- /**
- * 璇佷功澶辨晥鏃堕棿
- */
- @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
- private Date expiryTime;
-
- /**
- * 鐢ㄦ埛绫诲瀷
- */
- private String consumerType = "user";
-
- /**
- * 鐢ㄦ埛鏁伴噺
- */
- private Integer consumerAmount = 1;
-
- /**
- * 鎻忚堪淇℃伅
- */
- private String description = "";
-
- /**
- * 棰濆鐨勬湇鍔″櫒纭欢鏍￠獙淇℃伅
- */
- private LicenseCheck licenseCheck;
-
- @Override
- public String toString() {
- return "LicenseCreatorParam{" +
- "subject='" + subject + '\'' +
- ", privateAlias='" + privateAlias + '\'' +
- ", keyPass='" + keyPass + '\'' +
- ", storePass='" + storePass + '\'' +
- ", licensePath='" + licensePath + '\'' +
- ", privateKeysStorePath='" + privateKeysStorePath + '\'' +
- ", issuedTime=" + issuedTime +
- ", expiryTime=" + expiryTime +
- ", consumerType='" + consumerType + '\'' +
- ", consumerAmount=" + consumerAmount +
- ", description='" + description + '\'' +
- ", licenseCheck=" + licenseCheck +
- '}';
- }
-
-}
+package com.zy.asrs.wms.system.license.entity.license;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * License鐢熸垚绫婚渶瑕佺殑鍙傛暟
+ */
+@Data
+public class LicenseCreatorParam implements Serializable {
+
+ private static final long serialVersionUID = -7793154252684580872L;
+ /**
+ * 璇佷功subject
+ */
+ private String subject;
+
+ /**
+ * 瀵嗛挜鍒О
+ */
+ private String privateAlias;
+
+ /**
+ * 瀵嗛挜瀵嗙爜锛堥渶瑕佸Ε鍠勪繚绠★紝涓嶈兘璁╀娇鐢ㄨ�呯煡閬擄級
+ */
+ private String keyPass;
+
+ /**
+ * 璁块棶绉橀挜搴撶殑瀵嗙爜
+ */
+ private String storePass;
+
+ /**
+ * 璇佷功鐢熸垚璺緞
+ */
+ private String licensePath;
+
+ /**
+ * 瀵嗛挜搴撳瓨鍌ㄨ矾寰�
+ */
+ private String privateKeysStorePath;
+
+ /**
+ * 璇佷功鐢熸晥鏃堕棿
+ */
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ private Date issuedTime = new Date();
+
+ /**
+ * 璇佷功澶辨晥鏃堕棿
+ */
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ private Date expiryTime;
+
+ /**
+ * 鐢ㄦ埛绫诲瀷
+ */
+ private String consumerType = "user";
+
+ /**
+ * 鐢ㄦ埛鏁伴噺
+ */
+ private Integer consumerAmount = 1;
+
+ /**
+ * 鎻忚堪淇℃伅
+ */
+ private String description = "";
+
+ /**
+ * 棰濆鐨勬湇鍔″櫒纭欢鏍￠獙淇℃伅
+ */
+ private LicenseCheck licenseCheck;
+
+ @Override
+ public String toString() {
+ return "LicenseCreatorParam{" +
+ "subject='" + subject + '\'' +
+ ", privateAlias='" + privateAlias + '\'' +
+ ", keyPass='" + keyPass + '\'' +
+ ", storePass='" + storePass + '\'' +
+ ", licensePath='" + licensePath + '\'' +
+ ", privateKeysStorePath='" + privateKeysStorePath + '\'' +
+ ", issuedTime=" + issuedTime +
+ ", expiryTime=" + expiryTime +
+ ", consumerType='" + consumerType + '\'' +
+ ", consumerAmount=" + consumerAmount +
+ ", description='" + description + '\'' +
+ ", licenseCheck=" + licenseCheck +
+ '}';
+ }
+
+}
--
Gitblit v1.9.1