From be9da335cb28e12e1439c24e4596f069e342d83f Mon Sep 17 00:00:00 2001
From: guoshilong <123456>
Date: Fri, 12 Aug 2022 15:16:32 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 src/main/java/org/springblade/modules/sale/vo/SaleVO.java |   16 ++++++++++++++++
 1 files changed, 16 insertions(+), 0 deletions(-)

diff --git a/src/main/java/org/springblade/modules/sale/vo/SaleVO.java b/src/main/java/org/springblade/modules/sale/vo/SaleVO.java
index 5065874..a45f41e 100644
--- a/src/main/java/org/springblade/modules/sale/vo/SaleVO.java
+++ b/src/main/java/org/springblade/modules/sale/vo/SaleVO.java
@@ -48,6 +48,18 @@
 	 */
 	private String district;
 	/**
+	 * 销售地市中文
+	 */
+	private String cityName;
+	/**
+	 * 销售地区中文
+	 */
+	private String countyName;
+	/**
+	 * 省市区中文拼接
+	 */
+	private String saleDestination2;
+	/**
 	 * 地块名称
 	 */
 	private String landName;
@@ -64,4 +76,8 @@
 	 * 农场id
 	 */
 	private String farmId;
+	/**
+	 * 库存量主键id
+	 */
+	private String proid;
 }

--
Gitblit v1.9.3