提交dev

1

dist/static/css/chunk-1ca30b97.3194f810.css

@@ -1 +0,0 @@
-.alert[data-v-142acd92]{margin:10px 0}[data-v-142acd92] .el-icon-check,[data-v-142acd92] .el-icon-close{font-size:18px;font-weight:700}[data-v-142acd92] .el-icon-close{color:red}[data-v-142acd92] .el-icon-check{color:#14928a}.title[data-v-7576dd06]{margin-bottom:20px}.amap-demo[data-v-7576dd06]{height:500px}[data-v-69ae4217] .description-title{margin:0!important}

dist/static/css/chunk-74aa7010.e7625d6c.css

@@ -1,5 +0,0 @@
-<<<<<<< HEAD:dist/static/css/chunk-fb68d2e0.c25330a0.css
-.process[data-v-f049a426]{padding:10px;max-height:600px;overflow-y:auto}.dialog-footer[data-v-0dcea96b]{margin-top:20px;display:block;text-align:right}[data-v-619f17a0] .el-button+.el-button{margin-left:0}.select[data-v-619f17a0]{font-size:14px}.btnList[data-v-619f17a0]{display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-orient:horizontal;-webkit-box-direction:normal;-ms-flex-direction:row;flex-direction:row;-webkit-box-pack:start;-ms-flex-pack:start;justify-content:flex-start;-webkit-box-align:center;-ms-flex-align:center;align-items:center}.btnList div[data-v-619f17a0]{margin-right:15px}
-=======
-.process[data-v-f049a426]{padding:10px;max-height:600px;overflow-y:auto}.dialog-footer[data-v-0dcea96b]{margin-top:20px;display:block;text-align:right}[data-v-44ef2152] .el-button+.el-button{margin-left:0}.select[data-v-44ef2152]{font-size:14px}.btnList[data-v-44ef2152]{display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-orient:horizontal;-webkit-box-direction:normal;-ms-flex-direction:row;flex-direction:row;-webkit-box-pack:start;-ms-flex-pack:start;justify-content:flex-start;-webkit-box-align:center;-ms-flex-align:center;align-items:center}.btnList div[data-v-44ef2152]{margin-right:15px}
->>>>>>> 03/03Lebao:dist/static/css/chunk-74aa7010.e7625d6c.css

dist/static/css/chunk-fb68d2e0.c25330a0.css

@@ -1,5 +1 @@
-<<<<<<< HEAD:dist/static/css/chunk-fb68d2e0.c25330a0.css
-.process[data-v-f049a426]{padding:10px;max-height:600px;overflow-y:auto}.dialog-footer[data-v-0dcea96b]{margin-top:20px;display:block;text-align:right}[data-v-619f17a0] .el-button+.el-button{margin-left:0}.select[data-v-619f17a0]{font-size:14px}.btnList[data-v-619f17a0]{display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-orient:horizontal;-webkit-box-direction:normal;-ms-flex-direction:row;flex-direction:row;-webkit-box-pack:start;-ms-flex-pack:start;justify-content:flex-start;-webkit-box-align:center;-ms-flex-align:center;align-items:center}.btnList div[data-v-619f17a0]{margin-right:15px}
-=======
-.process[data-v-f049a426]{padding:10px;max-height:600px;overflow-y:auto}.dialog-footer[data-v-0dcea96b]{margin-top:20px;display:block;text-align:right}[data-v-44ef2152] .el-button+.el-button{margin-left:0}.select[data-v-44ef2152]{font-size:14px}.btnList[data-v-44ef2152]{display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-orient:horizontal;-webkit-box-direction:normal;-ms-flex-direction:row;flex-direction:row;-webkit-box-pack:start;-ms-flex-pack:start;justify-content:flex-start;-webkit-box-align:center;-ms-flex-align:center;align-items:center}.btnList div[data-v-44ef2152]{margin-right:15px}
->>>>>>> 03/03Lebao:dist/static/css/chunk-74aa7010.e7625d6c.css
+.process[data-v-f049a426]{padding:10px;max-height:600px;overflow-y:auto}.dialog-footer[data-v-0dcea96b]{margin-top:20px;display:block;text-align:right}[data-v-619f17a0] .el-button+.el-button{margin-left:0}.select[data-v-619f17a0]{font-size:14px}.btnList[data-v-619f17a0]{display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-orient:horizontal;-webkit-box-direction:normal;-ms-flex-direction:row;flex-direction:row;-webkit-box-pack:start;-ms-flex-pack:start;justify-content:flex-start;-webkit-box-align:center;-ms-flex-align:center;align-items:center}.btnList div[data-v-619f17a0]{margin-right:15px}