合并解决冲突1

backendEle/src/views/shop/package-add.vue

@@ -79,13 +79,10 @@
                     amount: this.form.amount,
                     amountPv: this.form.amountPv,
                     levelId: this.form.levelId,
-<<<<<<< HEAD
-                    packageContent: this.form.packageContent,
-					storenums:this.form.storenums,
-=======
+                    storenums:this.form.storenums,
                     packageContent: this.form.packageContent,
                     amountStandard: this.form.amountStandard,
->>>>>>> feature/theo-translate
+
 
                 }