Merge branch 'master' of http://121.40.234.130:8899/root/rongLiJiaNai

# Conflicts:
#	acs/hd/nladmin-system/src/main/java/org/nl/acs/ext/wms/service/impl/WmsToAcsServiceImpl.java
#	acs/hd/nladmin-system/src/main/java/org/nl/logicflow/service/impl/StageServiceImpl.java

acs/qd/src/main.js

@@ -61,8 +61,12 @@ Vue.use(VueHighlightJS)
 Vue.use(mavonEditor)
 Vue.use(permission)
 Vue.use(dict)
+
+// 全局设置控件样式https://codeantenna.com/a/0IN5FMJk5h
+Element.Table.props.border = { type: Boolean, default: true }
+Element.TableColumn.props.align = { type: String, default: 'center' }
 Vue.use(Element, {
-  size: Cookies.get('size') || 'small' // set element-ui default size
+  size: Cookies.get('size') || 'mini' // set element-ui default size
 })
 
 Vue.config.productionTip = false