update:修改冲突

application/services/goods/GoodsService.php

@@ -285,7 +285,7 @@ class GoodsService
             //立即上架和定时上架
             if (in_array($skuData["online_type"], [1,2])) {
                 if ($skuData["expiration_time"] <= $skuData['online_start_time']) {
-                    throw new GoodsException(["cus" => 49]);
+                    throw new GoodsException(["cus" => 52]);
                 }
             }
         }
@@ -612,7 +612,7 @@ class GoodsService
                 //立即上架和定时上架
                 if (in_array($onlineType, [1,2])) {
                     if ($sku["expiration_time"] <= $goodsSkuData['online_start_time']) {
-                        throw new GoodsException(["cus" => 49]);
+                        throw new GoodsException(["cus" => 52]);
                     }
                 }
 
@@ -850,7 +850,7 @@ class GoodsService
             //立即上架和定时上架
             if (in_array($params["online_type"], [1,2])) {
                 if ($skuData["expiration_time"] <= $skuParams['online_start_time']) {
-                    throw new GoodsException(["cus" => 49]);
+                    throw new GoodsException(["cus" => 52]);
                 }
             }
         }