Merge remote-tracking branch 'origin/master'

doum

昨天 417e33605dda0f28366a1d6e13c41198a156e3a7

 admin/src/assets/style/style.scss

@@ -118,3 +118,7 @@
    top: 1px;
  }
}
.detail-box{
  display: block;
  margin: 20px;
}