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

@@ -60,7 +60,7 @@ class CountLogic extends BaseLogic
     public function scheme_info(){
     public function scheme_info(){
         $data = [
         $data = [
             'company'=>$this->project['company'] ?? '',
             'company'=>$this->project['company'] ?? '',
-            'scheme'=>Project::planMap()[$this->project['deploy_build']['plan']],
+            'scheme'=>!empty($this->project['deploy_build']['plan']) ? Project::planMap()[$this->project['deploy_build']['plan']] : '',
             'service_duration'=>$this->project['deploy_build']['service_duration'],
             'service_duration'=>$this->project['deploy_build']['service_duration'],
         ];
         ];
         return $this->success($data);
         return $this->success($data);

@@ -463,9 +463,10 @@ class ProductLogic extends  BaseLogic
      */
      */
     public function copyExtendInfo($old_id,$new_id){
     public function copyExtendInfo($old_id,$new_id){
         $extendInfoModel = new ExtendInfo();
         $extendInfoModel = new ExtendInfo();
-        $extendList = $extendInfoModel->list(['product_id'=>$old_id]);
+        $extendList = $extendInfoModel->list(['product_id'=>$old_id],'created_at');
         if(!empty($extendList)){
         if(!empty($extendList)){
             foreach ($extendList as $k => $v){
             foreach ($extendList as $k => $v){
+                unset($v['id']);
                 $v['product_id'] = $new_id;
                 $v['product_id'] = $new_id;
                 $v['created_at'] = date('Y-m-d H:i:s');
                 $v['created_at'] = date('Y-m-d H:i:s');
                 $v['updated_at'] = date('Y-m-d H:i:s');
                 $v['updated_at'] = date('Y-m-d H:i:s');

@@ -25,7 +25,7 @@ class NewsRequest extends FormRequest
     {
     {
         return [
         return [
             'name'=>'required|max:200',
             'name'=>'required|max:200',
-//            'remark'=>'max:500',
+            'remark'=>'max:1000',
             'url'=>'required',
             'url'=>'required',
         ];
         ];
     }
     }
@@ -36,7 +36,7 @@ class NewsRequest extends FormRequest
             'name.required'=>'请填写名称',
             'name.required'=>'请填写名称',
             'name.max'=>'名称超过最长长度200',
             'name.max'=>'名称超过最长长度200',
             'url.required'=>'链接不能为空',
             'url.required'=>'链接不能为空',
-//            'remark.max'=>'描述超过最长长度500'
+            'remark.max'=>'描述超过最长长度1000'
         ];
         ];
     }
     }
 }
 }