Merge branch 'pre' into pre-0523diyweb-fr

src/views/componentGallery/imgList.vue

@@ -424,12 +424,9 @@ export default {
             });
             if (this.dialogName === "添加") {
                 // 直接从 data 中获取参数
-<<<<<<< HEAD
-=======
                 if(this.ruleForm.website_id == 'undefind' || this.ruleForm.website_id == ''){
                     this.ruleForm.website_id = 0;
                 }
->>>>>>> pre
                 const data = {
                     img_alias: this.ruleForm.img_alias,
                     img_url: this.ruleForm.img_url,