Merge remote-tracking branch 'origin/dev' into pro

.gitignore

@@ -19,5 +19,6 @@
 /demo.ipynb
 *.log.*
 !数据分析平台手册.doc
+*.pyc
 
 

LIB/MIDDLE/CellStateEstimation/SOH/V1_0_0/CBMSBatSoh.py

@@ -3,8 +3,8 @@ import numpy as np
 import datetime
 import bisect
 import matplotlib.pyplot as plt
-import BatParam
-import DBDownload
+from LIB.MIDDLE.CellStateEstimation.SOH.V1_0_0 import BatParam
+from LIB.MIDDLE.CellStateEstimation.SOH.V1_0_0 import DBDownload
 
 class BatSoh:
     def __init__(self,sn,celltype,df_bms,df_accum, host, port, db, user, password, tablename):  #参数初始化