Merge branch 'dev' into 'test'

外部通证列表添加"溯源哈希" See merge request !21

Merge branch 'dev' into 'test'
9d6c6175 · wulixian · 0311eff4 · 9e58d595 · 9d6c6175 · 9d6c6175
Commit 9d6c6175 authored Mar 11, 2022 by wulixian
Hide whitespace changes
Inline Side-by-side

Showing with 4 additions and 1 deletion

ExternalTokenDTO.java ...erver/admin/goods_center/entity/dto/ExternalTokenDTO.java +3 -0

ExternalToken.java ...m/mall/server/admin/goods_center/model/ExternalToken.java +1 -1

No files found.
--- a/mall-server-admin/src/main/java/com/fzm/mall/server/admin/goods_center/entity/dto/ExternalTokenDTO.java
+++ b/mall-server-admin/src/main/java/com/fzm/mall/server/admin/goods_center/entity/dto/ExternalTokenDTO.java
@@ -55,4 +55,7 @@ public class ExternalTokenDTO implements Serializable {

    @ApiModelProperty(value = "更新时间")
    private Long updateTime;
+
+    @ApiModelProperty(value = "溯源hash")
+    private String hash;
 }
--- a/mall-server-admin/src/main/java/com/fzm/mall/server/admin/goods_center/model/ExternalToken.java
+++ b/mall-server-admin/src/main/java/com/fzm/mall/server/admin/goods_center/model/ExternalToken.java
@@ -86,6 +86,6 @@ public class ExternalToken implements Serializable {
    @TableField(fill = FieldFill.INSERT_UPDATE)
    private Long updateTime;

-    @ApiModelProperty(value = "商户id")
+    @ApiModelProperty(value = "溯源hash")
    private String hash;
 }