Merge branch 'dev' of http://git.patzn.com/wangweidong/pt-cloud-service-soil-web into dev

pages/meter-entrust/entrust-register/EntrustRegisterEdit.vue

 <template>
   <div>
-    <Modal v-model="showModal" :mask-closable="false" width="900">
+    <Modal v-model="showModal" :mask-closable="false" width="1200">
       <p slot="header">{{modalTitle}}</p>
       <div>
         <Form id="MeterSendTestEdit" ref="formObj" :model="formObj" :rules="ruleValidate" :label-width="90" inline>