Merge remote-tracking branch 'origin/dev-ty1.2' into dev-ty1.2

mhd_bms/src/main/java/com/mhd/bms/domain/billManage/entity/BillDetail.java

@@ -88,4 +88,10 @@ public class BillDetail extends BaseVOEntity{
     private String invoiceItemName;
     @ApiModelProperty(value = "费用类别")
     private String feeType;
+    @ApiModelProperty(value = "计费单位")
+    private String billingUnit;
+    @ApiModelProperty(value = "计费数量")
+    private BigDecimal billingNum;
+    @ApiModelProperty(value = "计费单价")
+    private BigDecimal billingUnitPrice;
 }

mhd_bms/src/main/java/com/mhd/bms/domain/billManage/repository/po/BillDetailPO.java

@@ -134,5 +134,11 @@ public class BillDetailPO extends BaseVOEntity{
     private String invoiceItemName;
     @ApiModelProperty(value = "费用类别")
     private String feeType;
+    @ApiModelProperty(value = "计费单位")
+    private String billingUnit;
+    @ApiModelProperty(value = "计费数量")
+    private BigDecimal billingNum;
+    @ApiModelProperty(value = "计费单价")
+    private BigDecimal billingUnitPrice;
 
 }

mhd_bms/src/main/java/com/mhd/bms/domain/billManage/repository/todo/BillDetailDO.java

@@ -98,4 +98,10 @@ public class BillDetailDO extends BaseVOEntity{
     private String invoiceItemName;
     @ApiModelProperty(value = "费用类别")
     private String feeType;
+    @ApiModelProperty(value = "计费单位")
+    private String billingUnit;
+    @ApiModelProperty(value = "计费数量")
+    private BigDecimal billingNum;
+    @ApiModelProperty(value = "计费单价")
+    private BigDecimal billingUnitPrice;
 }

mhd_bms/src/main/java/com/mhd/bms/interfaces/dto/billManage/BillDetailDTO.java

@@ -139,4 +139,10 @@ public class BillDetailDTO extends BaseVOEntity{
     private String invoiceItemName;
     @ApiModelProperty(value = "费用类别")
     private String feeType;
+    @ApiModelProperty(value = "计费单位")
+    private String billingUnit;
+    @ApiModelProperty(value = "计费数量")
+    private BigDecimal billingNum;
+    @ApiModelProperty(value = "计费单价")
+    private BigDecimal billingUnitPrice;
 }

sql/20260803_alter_table_lease_add_status.sql

@@ -14,3 +14,14 @@ ALTER TABLE NGWL_TEST_SYSTEM.LEASE ADD status TINYINT DEFAULT 1;
 
 -- 2. 添加注释（达梦必须单独写）
 COMMENT ON COLUMN NGWL_TEST_SYSTEM.LEASE.status IS '状态：1=启用，0=停用';
+
+
+
+
+-- bms
+ALTER TABLE "NGWL_TEST_BMS"."BILL_DETAIL" ADD BILLING_UNIT VARCHAR2(100);
+ALTER TABLE "NGWL_TEST_BMS"."BILL_DETAIL" ADD BILLING_NUM NUMBER(18,2);
+ALTER TABLE "NGWL_TEST_BMS"."BILL_DETAIL" ADD BILLING_UNIT_PRICE NUMBER(18,2);
+COMMENT ON COLUMN "NGWL_TEST_BMS"."BILL_DETAIL".BILLING_UNIT IS '计费单位';
+COMMENT ON COLUMN "NGWL_TEST_BMS"."BILL_DETAIL".BILLING_NUM IS '计费数量';
+COMMENT ON COLUMN "NGWL_TEST_BMS"."BILL_DETAIL".BILLING_UNIT_PRICE IS '计费单价';