From a1cf90b0e3641bf60d7e10e84345bb8f2cfc1424 Mon Sep 17 00:00:00 2001
From: 沈斌 <bluelazysb@hotmail.com>
Date: Fri, 27 Oct 2017 10:27:42 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 src/main/resources/sysConfig.properties |   28 +++++++++++++++++++++++++++-
 1 files changed, 27 insertions(+), 1 deletions(-)

diff --git a/src/main/resources/sysConfig.properties b/src/main/resources/sysConfig.properties
index 91bbe87..15c6c87 100644
--- a/src/main/resources/sysConfig.properties
+++ b/src/main/resources/sysConfig.properties
@@ -1,2 +1,28 @@
 randCodeLength=4
-randCodeType=5
\ No newline at end of file
+randCodeType=5
+e1=0,35,75,115,150,250,350,500
+e2=0,50,150,250,350,420,500,600
+e10=0,2,4,14,24,36,48,60
+e11=0,50,150,475,800,1600,2100,2620
+e15=0,100,160,215,265,800,1000,1200
+e16=0,40,80,180,280,565,750,940
+IAQI=0,50,100,150,200,300,400,500
+e1-standard=35
+e2-standard=50
+e3-standard=
+e4-standard=
+e5-standard=
+e6-standard=
+e7-standard=
+e8-standard=
+e9-standard=
+e10-standard=2
+e11-standard=50
+e12-standard=
+e13-standard=
+e14-standard=100
+e15-standard=100
+e16-standard=40
+e17-standard=
+e18-standard=
+e19-standard=
\ No newline at end of file

--
Gitblit v1.8.0