Merge branch 'develop' of http://47.244.231.31:8099/zhl/globalso-v6 into develop

@@ -54,31 +54,31 @@ class Product extends Base
         return $value;
         return $value;
     }
     }
 
 
-    /**
-     * @remark :图标获取器
-     * @name   :getGalleryAttribute
-     * @author :lyh
-     * @method :post
-     * @time   :2023/7/21 11:11
-     */
-    public function setIconAttribute($value){
-        $this->attributes['icon'] = Arr::a2s($value);
-    }
-
-    /**
-     * @remark :图标获取器
-     * @name   :getGalleryAttribute
-     * @author :lyh
-     * @method :post
-     * @time   :2023/7/21 11:11
-     */
-    public function getIconAttribute($value){
-        $value = Arr::s2a($value);
-        foreach ($value as &$v){
-            $v = $this->getImageUrl($v);
-        }
-        return $value;
-    }
+//    /**
+//     * @remark :图标获取器
+//     * @name   :getGalleryAttribute
+//     * @author :lyh
+//     * @method :post
+//     * @time   :2023/7/21 11:11
+//     */
+//    public function setIconAttribute($value){
+//        $this->attributes['icon'] = Arr::a2s($value);
+//    }
+//
+//    /**
+//     * @remark :图标获取器
+//     * @name   :getGalleryAttribute
+//     * @author :lyh
+//     * @method :post
+//     * @time   :2023/7/21 11:11
+//     */
+//    public function getIconAttribute($value){
+//        $value = Arr::s2a($value);
+//        foreach ($value as &$v){
+//            $v = $this->getImageUrl($v);
+//        }
+//        return $value;
+//    }
 
 
     public function setAttrsAttribute($value){
     public function setAttrsAttribute($value){
         $this->attributes['attrs'] = Arr::a2s($value);
         $this->attributes['attrs'] = Arr::a2s($value);