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

business/jxstore/cms/cms.go

@@ -336,15 +336,14 @@ func UpdateConfig(ctx *jxcontext.Context, key, configType, value string) (hint s
 			dao.Rollback(db)
 			return "", err
 		}
+		dao.Commit(db)
 		for _, v := range storeMapList {
 			if _, err = dao.UpdateEntityLogicallyAndUpdateSyncStatus(db, &model.StoreSkuBind{}, nil, ctx.GetUserName(), map[string]interface{}{
 				model.FieldStoreID: v.StoreID,
 			}, dao.GetSyncStatusStructField(model.VendorNames[v.VendorID]), model.SyncFlagPriceMask); err != nil {
-				dao.Rollback(db)
 				return "", err
 			}
 		}
-		dao.Commit(db)
 	case model.ConfigTypeFreightPack:
 		dao.Commit(db)
 		storeMapList, err := dao.GetStoresMapList(db, nil, nil, model.StoreStatusAll, model.StoreIsSyncYes, "")