Merge branch 'pengyouhao_dev' into develop

src/views/mallManagement/activityOrder/detail.vue

@@ -11,7 +11,7 @@
 					<el-row :gutter="20" justify="start">
 						<el-col :span="6">
 							<el-form-item label="所属商户" :required="true" >
-								<el-input type="text" :value="companyName" disabled></el-input>
+								<el-input type="text" :value="formData.companyWechatName?formData.companyWechatName:companyName" disabled></el-input>
 							</el-form-item>
 						</el-col>
 						<el-col :span="6" style="height: 51px;">