Merge branch 'master' of http://139.196.39.194:9021/chenc/cd-work-flow-web

src/views/activiti/form/demoForm2.vue

@@ -301,6 +301,7 @@ export default {
                                     // })
                                     this.dynamicData.supplierList = userData.data.supplierList
                                     this.dynamicData.customerList = userData.data.customerList
+                                    this.dynamicData.userNameList = userData.data.userNameList
                                 }
                               
                                 userData.result.records.forEach(user => {