Merge remote-tracking branch 'origin/master'

xiebin

2022-08-11 7ae4b4b6679ba419cfd92d2a60ed603c2c8a446d

 src/views/land/landUpdate.vue

@@ -53,6 +53,7 @@
                        label: "所属农场",
                        prop: "farmId",
                        type: "tree",
                        disabled:true,
                        dicData: [],
                        props: {
                            label: "farmName",