From 0b39a6b4f6962d9454a61d34bba2098ffa3993a9 Mon Sep 17 00:00:00 2001
From: Pu Zhibing <393733352@qq.com>
Date: 星期日, 20 四月 2025 01:51:14 +0800
Subject: [PATCH] Merge branch '1.1' of http://120.76.84.145:10101/gitblit/r/java/XianNingChuXing

---
 DriverOKTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/Company.java |   15 ++++++++++++++-
 1 files changed, 14 insertions(+), 1 deletions(-)

diff --git a/DriverOKTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/Company.java b/DriverOKTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/Company.java
index 3e6a333..bd3a4ae 100644
--- a/DriverOKTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/Company.java
+++ b/DriverOKTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/Company.java
@@ -269,6 +269,11 @@
      */
     @TableField("percentageDeduction")
     private Double percentageDeduction;
+    /**
+     * 打表计费扣除
+     */
+    @TableField("meterPrintingFee")
+    private Double meterPrintingFee;
 
     public Double getFixedDeduction() {
         return fixedDeduction;
@@ -677,7 +682,15 @@
     public void setInsertTime(Date insertTime) {
         this.insertTime = insertTime;
     }
-
+    
+    public Double getMeterPrintingFee() {
+        return meterPrintingFee;
+    }
+    
+    public void setMeterPrintingFee(Double meterPrintingFee) {
+        this.meterPrintingFee = meterPrintingFee;
+    }
+    
     @Override
     public String toString() {
         return "Company{" +

--
Gitblit v1.7.1