Merge branch 'moss_dev' into develop

* moss_dev:
  no message

src/views/mallManagement/configCenter/serviceProduct/index.vue

@@ -382,7 +382,7 @@ export default {
       this.$refs.addChildForm.validate((valid) => {
         if (valid) {
           let params = {}
-          if(this.addChildFormType == 'edit') {
+          if(this.addChildFormType == 'edit2') {
             params = {
               type: 2,
               categoryId: this.editChildId,