Merge branch 'feature/2月迭代' into dev

src/views/enterprise/salutatorySet.vue

@@ -230,6 +230,7 @@ export default {
         welcomeContent: [{ required: true, message: '请输入欢迎语内容', trigger: 'blur' }]
       },
       wxEnterpriseId: localStorage.getItem('userInfos') ? JSON.parse(localStorage.getItem('userInfos')).wxEnterpriseId : '',
+      enterpriseId: localStorage.getItem('userInfos') ? JSON.parse(localStorage.getItem('userInfos')).enterpriseId : '',
       emojiList: emojiArr,
       addReplayDialog: false,
       url: '',
@@ -571,7 +572,7 @@ export default {
     getData() {
       let para = {
         welcomeId: this.$route.query.id,
-        wxEnterpriseId: this.wxEnterpriseId
+        enterpriseId: this.enterpriseId
       };
       getRequest('/haoban-manage3-web/welcome/get', para)
         .then(res => {