Merge branch 'production' of https://gitee.com/doan-tech/shanghaigangxiangtuzhuangMES

# Conflicts:
#	ZR.Admin.WebApi/appsettings.development.json

ZR.Model/MES/qc/QcQualityStatisticsFirst.cs

@@ -26,6 +26,14 @@
         ///</summary>
         [SugarColumn(ColumnName = "product_description")]
         public string ProductDescription { get; set; }
+
+        /// <summary>
+        /// 颜色 
+        ///</summary>
+        [SugarColumn(ColumnName = "color")]
+        public string Color { get; set; }
+
+
         /// <summary>
         /// 生产投入数 
         ///</summary>