jfpt-Vue.git - Gitblit

main / jfpt-Vue

南昌市物联网技防平台-前端

summary
reflog
commits
tree
docs
forks
compare

冲突合并

liuyg

2021-04-26 7c4b47852e921718259c3e27421f44f8d2edb7fc

 src/views/parcel/parcel.vue

@@ -87,7 +87,7 @@
        option: {
          menu:false,
          height:'auto',
          calcHeight: 30,
          calcHeight: 54,
          tip: false,
          searchShow: true,
          searchMenuSpan: 6,

			@@ -87,7 +87,7 @@
			option: {
			menu:false,
			height:'auto',
			calcHeight: 30,
			calcHeight: 54,
			tip: false,
			searchShow: true,
			searchMenuSpan: 6,