From 7ff92e90d2318f5c2597c4ba01e0cbfde983cec0 Mon Sep 17 00:00:00 2001
From: doum <doum>
Date: 星期三, 17 六月 2026 10:13:35 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/2.0.1' into 2.0.1
---
server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/YwContractRevenue.java | 26 ++++++++++++++++++--------
1 files changed, 18 insertions(+), 8 deletions(-)
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/YwContractRevenue.java b/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/YwContractRevenue.java
index 8c374fa..22574c0 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/YwContractRevenue.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/YwContractRevenue.java
@@ -2,9 +2,8 @@
import com.baomidou.mybatisplus.annotation.TableField;
import com.doumee.core.annotation.excel.ExcelColumn;
-import com.doumee.core.constants.OperaType;
import com.doumee.core.model.LoginUserModel;
-import com.doumee.dao.business.vo.EditRecordDataVO;
+import com.doumee.dao.business.dto.EditRecordDataVO;
import com.doumee.dao.system.model.Multifile;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
@@ -14,7 +13,6 @@
import lombok.Data;
import com.fasterxml.jackson.annotation.JsonFormat;
-import javax.validation.constraints.NotBlank;
import java.util.Date;
import java.math.BigDecimal;
import java.util.List;
@@ -38,7 +36,7 @@
@ApiModelProperty(value = "鍒涘缓鏃堕棿")
@ExcelColumn(name="鍒涘缓鏃ユ湡",index = 8,width = 10,dateFormat = "yyyy-MM-dd HH:mm:ss")
- @JsonFormat(pattern = "yyyy-MM-dd")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date createDate;
@ApiModelProperty(value = "鏇存柊浜虹紪鐮�", example = "1")
@@ -83,6 +81,9 @@
@ApiModelProperty(value = "璐﹀崟涓婚敭锛堝叧鑱攜w_contract_bill锛�", example = "1")
private Integer billId;
+ @ApiModelProperty(value = "寰俊鏀粯璁㈠崟鍙�")
+ private String wxOrderNo;
+
@ApiModelProperty(value = "鏀舵敮绫诲瀷锛�0=鏀跺叆锛�1=鏀嚭", example = "1")
@ExcelColumn(name="鏀舵敮绫诲瀷",index = 4,width = 10,valueMapping = "0=鏀跺叆;1=鏀嚭")
private Integer revenueType;
@@ -92,20 +93,29 @@
@ExcelColumn(name="鍚堝悓缂栧彿",index = 1,width = 10)
@TableField(exist = false)
private String contractCode;
-
-
- @ApiModelProperty(value = "瀹㈡埛鍚嶇О")
+ @ApiModelProperty(value = "鍚堝悓鐙�鎱�", example = "1")
@TableField(exist = false)
- private String customerNme;
+ private String contractStatus;
+
@ApiModelProperty(value = "瀹㈡埛鍚嶇О锛堜粯娆炬柟锛�", example = "1")
@ExcelColumn(name="瀹㈡埛鍚嶇О",index = 0,width = 10)
@TableField(exist = false)
private String customerName;
+ @ApiModelProperty(value = "娴佹按璐﹀彿")
+ @TableField(exist = false)
+ private String accountTitle;
+
+
+ @ApiModelProperty(value = "璐﹀崟绫诲瀷", example = "1" , hidden = true)
+ @TableField(exist = false)
+ private Integer billType;
+
@ApiModelProperty(value = "鍒涘缓浜哄悕绉�")
@ExcelColumn(name="鍒涘缓浜�",index = 9,width = 10)
+ @TableField(exist = false)
private String realname;
@ApiModelProperty(value = "鍏宠仈鎴块棿鏁版嵁", example = "1")
--
Gitblit v1.9.3