Merge remote-tracking branch 'origin/master'

ruoyi-modules/ruoyi-backstage/src/main/java/org/dromara/backstage/basics/domain/vo/PtWorkstationVo.java

@@ -37,7 +37,7 @@ public class PtWorkstationVo implements Serializable {
     /**
      * 工伤站名称
      */
-    @ExcelProperty(value = "工伤站名称")
+    @ExcelProperty(value = "工作站名称")
     private String stationName;
 
     /**

ruoyi-modules/ruoyi-backstage/src/main/java/org/dromara/backstage/consumption/domain/vo/XfConsumeDetailVo.java

@@ -32,13 +32,13 @@ public class XfConsumeDetailVo implements Serializable {
     /**
      * 消费记录Id,主键
      */
-    @ExcelProperty(value = "消费记录Id,主键")
+    @ExcelProperty(value = "消费记录Id")
     private String consumeId;
 
     /**
      * 原始记录Id,主键
      */
-    @ExcelProperty(value = "原始记录Id,主键")
+    @ExcelProperty(value = "原始记录Id")
     private String originalId;
 
     /**
@@ -207,13 +207,13 @@ public class XfConsumeDetailVo implements Serializable {
     /**
      * 是否发送短信,见 sys_yes_no字典类别
      */
-    @ExcelProperty(value = "是否发送短信,见 sys_yes_no字典类别")
+    @ExcelProperty(value = "是否发送短信")
     private String smsSend;
 
     /**
      * 消费记录标志位?
      */
-    @ExcelProperty(value = "消费记录标志位?")
+//    @ExcelProperty(value = "消费记录标志位?")
     private Long recordStatus;
 
     /**