1.消费流水明细/充值流水优化

2.消费流水导出没有数据 bug
3.异常扣费数据保存, 页面回显
4.扣费闸机在线扣费异常信息返回调整
5.二次扣费,自定义扣费 不去校验用户本餐是否就餐

jeecg-module-system/jeecg-system-api/jeecg-system-local-api/src/main/java/org/jeecg/payment/entity/StConsumptionExceptionRecord.java

@@ -49,8 +49,11 @@ public class StConsumptionExceptionRecord implements Serializable {
     private Integer secondChargeFlag;
     @Schema(title ="自定义扣费标记 1 是 ; 0 否")
     private Integer isCustom;
-    @Schema(title ="恢复标记 1 是; 0 否")
+    @Schema(title ="恢复标记 1 是; 0 否; 3 不展示恢复标记")
     private Integer isRestore;
+    @Schema(title ="异常提示")
+    private String errorMsg;
+
 
 
     /**创建日期*/

jeecg-module-system/jeecg-system-api/jeecg-system-local-api/src/main/java/org/jeecg/payment/vo/StExceptionRecordVo.java

@@ -48,4 +48,6 @@ public class StExceptionRecordVo {
     @Schema(title ="部门名称")
     private String deptName;
 
+    private String errorMsg;
+
 }

jeecg-module-system/jeecg-system-api/jeecg-system-local-api/src/main/java/org/jeecg/payment/vo/StRfidVo.java

@@ -55,4 +55,6 @@ public class StRfidVo {
 	 * 恢复标记 1 是; 0 否
 	 */
 	private Integer isRestore;
+
+	private String errorMsg;
 }