Merge branch 'dev' into 'test'

mall-server-admin/src/main/java/com/fzm/mall/server/admin/block_chain/nft/NftEvm.java

@@ -273,6 +273,30 @@ public class NftEvm {
 //        System.err.println();
 
 //        System.err.println(ra.walletUnlock("ymc12345"));
+
+          /*JSONObject userDetail = new JSONObject();
+        userDetail.put("user_name", merchant.getApplyName());
+        userDetail.put("user_icon", "");
+        userDetail.put("phone", merchant.getApplyPhone());
+        userDetail.put("email", merchant.getLinkMail());
+        userDetail.put("auth_type", 1);
+        JSONObject personalAuth = new JSONObject();
+        personalAuth.put("real_name", merchant.getShortName());
+        JSONObject enterpriseAuth = new JSONObject();
+        enterpriseAuth.put("enterprise_name", "复杂美");
+        JSONObject json = new JSONObject();
+        json.put("op", "set");
+        json.put("organization", "system");
+        json.put("role", "member");
+        json.put("address", merchant.getTokenIssueAddr());
+        json.put("organization_note", "");
+        json.put("address_note", "");
+        json.put("user_detail", userDetail);
+        json.put("personal_auth", personalAuth);
+        json.put("enterprise_auth", enterpriseAuth);
+        String processGeneralTran = chainUtilFactory.processGeneralTran(json);*/
+
+
     }
 
 }

mall-server-admin/src/main/java/com/fzm/mall/server/admin/goods_center/entity/vo/GoodsSpuVO.java

@@ -49,4 +49,5 @@ public class GoodsSpuVO {
     @TableField(exist = false)
     private String tokenIdStr;
 
+    private Long preheatEndTime;
 }

mall-server-admin/src/main/resources/mapper/goods_center/SpuMapper.xml

@@ -40,7 +40,7 @@
         SELECT
         G.goods_id,G.name,G.thumb,G.status,G.max_price,G.default_price,
         M.enterprise_name,M.apply_name AS linkName,M.apply_phone AS linkPhone,G.check_fail_reason,G.type,
-        G.create_time,G.commodity_pass
+        G.create_time,G.commodity_pass, G.preheat_end_time
         FROM
         goods_spu G
         LEFT JOIN