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

@@ -527,6 +527,7 @@ class BTemplateLogic extends BaseLogic
                 $templateComModel->add($param);
             }else{
                 $templateComModel->edit($param,$condition);
+                @file_put_contents(storage_path('logs/lyh_error.log'), var_export($condition, true) . PHP_EOL, FILE_APPEND);
             }
         }
         return $this->success();