Merge remote-tracking branch 'origin/mark' into yonghui

business/jxstore/cms/sku.go

@@ -791,8 +791,10 @@ func UpdateSkuName(ctx *jxcontext.Context, nameID int, payload map[string]interf
 	valid = utils.RemoveGeneralMapKeys(valid, model.FieldSpecQuality, model.FieldSpecUnit)
 	_, hasPlaces := payload["places"]
 	if len(valid) > 0 || hasPlaces {
-		if upc, _ := valid["Upc"].(string); upc == "" {
-			valid["Upc"] = nil
+		if valid["Upc"] != nil {
+			if upc, _ := valid["Upc"].(string); upc == "" {
+				valid["Upc"] = nil
+			}
 		}
 		globals.SugarLogger.Debugf("UpdateSkuName valid:%s", utils.Format4Output(valid, false))
 		// if upc, _ := valid["Upc"].(string); upc != "" {