Merge branch 'master' into djp

test

12 小时以前 c5dc821692c0529e3a688af84c647bf80cc49360

 HTML/views/QualityControl/QualityInformation.html

@@ -209,7 +209,7 @@
                  SkuNo: SkuNo,
                  SkuName: SkuName,
                  IsQualified: IsQualified,
                  Origin: 'WMS'
                  Origin: ''
               };
               // console.log(param)
               var url = "/BllQuality/GetBllQualityList";