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

LIB/MIDDLE/SaftyCenter/DataDiag_Static/SC_BMSUploadError.py

@@ -34,7 +34,7 @@ class BMSReportError:
                 if FactoryType ==1:
                     code=df_bms.loc[i,'故障代码']
                     newCode=[]
-                    if len(code):
+                    if not pd.isnull(code):
                         if code>2:
                             num=math.log(code)/math.log(2)
                             power=int(num)