门店

gic-store-web/src/main/java/com/gic/store/web/qo/store/QrcodeQO.java

 package com.gic.store.web.qo.store;
 
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.gic.store.dto.StoreSearchDTO;
+import org.apache.commons.lang.StringUtils;
+
 import java.io.Serializable;
 import java.util.Date;
 import java.util.List;
 
-import com.gic.store.dto.StoreSearchDTO;
-import org.apache.commons.lang.StringUtils;
-
 /**
  * 
  * @ClassName: QrcodeQO
@@ -15,7 +16,8 @@ import org.apache.commons.lang.StringUtils;
  * @date 2020-09-09 19:07
  */
 public class QrcodeQO implements Serializable {
-    private Integer h5 = 0;
+    @JsonProperty("h5")
+    private Integer html = 0;
     private String appletIds;
     private String fwhIds;
     private String scenesValueIds;
@@ -28,13 +30,13 @@ public class QrcodeQO implements Serializable {
     private String fileName;
     private StoreSearchDTO storeSearchDTO;
 
-    public Integer getH5() {
-        return h5;
+    public Integer getHtml() {
+        return html;
     }
 
-    public void setH5(Integer h5) {
-        if(h5 != null && StringUtils.isNotBlank(h5+"")){
-            this.h5 = h5;
+    public void setHtml(Integer html) {
+        if(html != null && StringUtils.isNotBlank(html +"")){
+            this.html = html;
         }
     }
 

gic-store-web/src/main/java/com/gic/store/web/utils/ExcelUtils.java

@@ -60,9 +60,9 @@ public class ExcelUtils {
             for (int j = 0; j < everyLines.get(i).size(); j++) {
                 sheet.setColumnWidth(j, COLUMN_HEIGHT);
                 //将内容按顺序赋给对应的列对象
-                XSSFCell cell1 = row.createCell(j);
-                cell1.setCellValue(everyLines.get(i).get(j));
-                cell1.setCellStyle(style);
+                XSSFCell cellTmp = row.createCell(j);
+                cellTmp.setCellValue(everyLines.get(i).get(j));
+                cellTmp.setCellStyle(style);
             }
         }
         return wb;