Merge branch 'demo_' of http://124.71.196.186:8888/hfxc226/hitch-antd into demo_

src/views/purchase/purchase-order-page/modules/BaseForm.vue

@@ -41,7 +41,7 @@
               :wrapperCol="BaseTool.Constant.wrapperCol"
             >
               <a-input
-                v-decorator="['cmemo']"/>
+                v-decorator="['remark']"/>
             </a-form-item>
           </row-item>
           <row-item >
@@ -384,7 +384,7 @@ export default {
           'cdefine11',
           'cdefine12',
           'cptcode',
-          'cmemo',
+          'remark',
           'cdepcode',
           'cbustype',
           'planGetDate',