Merge remote-tracking branch 'origin/develop' into develop-green

src/custom/restcontroller/webmanage/sale/item/SQL/货品档案更新.sql

@@ -49,7 +49,7 @@ SET changeuserid=$userid$,
     customprice=$customprice$,
     pricingmetod=$pricingmetod$,
     cheekschemeid=$cheekschemeid$,
-    colorschemeid=$customprice$,
+    colorschemeid=$colorschemeid$,
     materialschemeid=$materialschemeid$
 WHERE itemid = $itemid$
   and siteid = $siteid$