From e0395c5454534e7cf657b10045d00e4042dc7e71 Mon Sep 17 00:00:00 2001
From: houruijun <411269194@kidgrow.com>
Date: Mon, 28 Sep 2020 15:51:08 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/pay_master' into pay_master
---
kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-api/src/main/java/com/kidgrow/oprationcenter/model/ConsumptionRecord.java | 22 ++++------------------
1 files changed, 4 insertions(+), 18 deletions(-)
diff --git a/kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-api/src/main/java/com/kidgrow/oprationcenter/model/ConsumptionRecord.java b/kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-api/src/main/java/com/kidgrow/oprationcenter/model/ConsumptionRecord.java
index 44b83e1..16e20b8 100644
--- a/kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-api/src/main/java/com/kidgrow/oprationcenter/model/ConsumptionRecord.java
+++ b/kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-api/src/main/java/com/kidgrow/oprationcenter/model/ConsumptionRecord.java
@@ -1,6 +1,5 @@
package com.kidgrow.oprationcenter.model;
-import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import com.fasterxml.jackson.annotation.JsonFormat;
@@ -32,23 +31,6 @@
@TableName("consumption_record")
public class ConsumptionRecord extends BaseModel {
private static final long serialVersionUID = 1L;
-
- /**
- * 医院ID
- */
- @TableField(exist = false)
- private Long hospitalId;
- /**
- * 科室ID
- */
- @TableField(exist = false)
- private Long departmentId;
- /**
- * 医生ID
- */
- @TableField(exist = false)
- private Long doctorId;
-
/**
* 上次消费记录id（用于退费，扣费）
*/
@@ -71,6 +53,10 @@
*/
private String businessId;
/**
+ * 调用方诊断id
+ */
+ private String diaId;
+ /**
* 记录类型
* 1：预扣费
* 2：退预扣费（需要关联预扣费编号）
--
Gitblit v1.8.0