From cc1f16fe433f98cb4e755e95e184ba7deaaa5283 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=A0=81=E5=86=9C=E7=9A=84=E6=98=A5=E5=A4=A9?=
 <416662981@qq.com>
Date: Mon, 23 Oct 2017 20:53:59 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E7=89=88=E6=9C=AC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index 67adf0ce..603ad5e1 100644
--- a/pom.xml
+++ b/pom.xml
@@ -4,7 +4,7 @@
   <modelVersion>4.0.0</modelVersion>
   <groupId>com.jsh</groupId>
   <artifactId>jshERP</artifactId>
-  <version>2017.10.13</version>
+  <version>2017.10.23</version>
   <packaging>war</packaging>  
   <name>jshERP</name> 
   <url>http://git.oschina.net/jishenghua/JSH_ERP</url>

From bcefc54c4e4d003befbe93ed2d2b57db41d8f52d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=A0=81=E5=86=9C=E7=9A=84=E6=98=A5=E5=A4=A9?=
 <416662981@qq.com>
Date: Mon, 23 Oct 2017 21:18:42 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E4=BC=98=E5=8C=96=E5=95=86=E5=93=81?=
 =?UTF-8?q?=E5=AF=BC=E5=85=A5=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/jsh/util/MaterialConstants.java  | 30 +++++++------------
 1 file changed, 10 insertions(+), 20 deletions(-)

diff --git a/src/main/java/com/jsh/util/MaterialConstants.java b/src/main/java/com/jsh/util/MaterialConstants.java
index 68a6bdf1..d5f5a3ad 100644
--- a/src/main/java/com/jsh/util/MaterialConstants.java
+++ b/src/main/java/com/jsh/util/MaterialConstants.java
@@ -31,55 +31,45 @@ public interface MaterialConstants
          */
         public static final int EXCEL_CATEGORY = 1;
 
-        /**
-         * 颜色
-         */
-        public static final int EXCEL_COLOR = 2;
-
         /**
          * 型号
          */
-        public static final int EXCEL_MODEL = 3;
-
-        /**
-         * 规格
-         */
-        public static final int EXCEL_STANDARD = 4;
+        public static final int EXCEL_MODEL = 2;
 
         /**
          * 安全存量
          */
-        public static final int EXCEL_SAFETY_STOCK = 5;
+        public static final int EXCEL_SAFETY_STOCK = 3;
 
         /**
          * 单位
          */
-        public static final int EXCEL_UNIT = 6;
+        public static final int EXCEL_UNIT = 4;
 
         /**
          * 零售价
          */
-        public static final int EXCEL_RETAILPRICE = 7;
+        public static final int EXCEL_RETAILPRICE = 5;
 
         /**
          * 最低售价
          */
-        public static final int EXCEL_LOWPRICE = 8;
+        public static final int EXCEL_LOWPRICE = 6;
 
         /**
-         * 预设售价一
+         * 预计采购价
          */
-        public static final int EXCEL_PRESETPRICEONE = 9;
+        public static final int EXCEL_PRESETPRICEONE = 7;
 
         /**
-         * 预设售价二
+         * 批发价
          */
-        public static final int EXCEL_PRESETPRICETWO = 10;
+        public static final int EXCEL_PRESETPRICETWO = 8;
 
         /**
          * 备注
          */
-        public static final int EXCEL_REMARK = 11;
+        public static final int EXCEL_REMARK = 9;
 
         /**
          * 表头