Merge remote-tracking branch 'origin/develop' into develop

This commit is contained in:
yanyizhou
2021-12-16 20:56:49 +08:00
@@ -1537,6 +1537,7 @@
:multiple=true :multiple=true
:check-strictly=true :check-strictly=true
:modalShowFlag="modalShowFlag2" :modalShowFlag="modalShowFlag2"
:type="'car'"
:drawerTitle="drawerTitle" :drawerTitle="drawerTitle"
:url="url" :url="url"
:urlChild="urlChild" :urlChild="urlChild"
@@ -1549,6 +1550,7 @@
:check-strictly=true :check-strictly=true
:modalShowFlag="modalShowFlag3" :modalShowFlag="modalShowFlag3"
:drawerTitle="drawerTitle" :drawerTitle="drawerTitle"
:type="'truck'"
:url="url" :url="url"
:urlChild="urlChild" :urlChild="urlChild"
:defaultProps="defaultCodeProps" :checkedKeys="defaultCheckedKeys2" :defaultProps="defaultCodeProps" :checkedKeys="defaultCheckedKeys2"