@@ -79,7 +79,6 @@
</div>
<div class="button_box">
->>>>>>> 1807a4cbfb1e0a088bdcd174f97fd48986f268f8
<el-button @click="cancel">取消</el-button>
<el-button type="primary" @click="makeSure">确定</el-button>
