Merge remote-tracking branch 'origin/dev-mysql' into dev-mysql

src/main/webapp/resources/view/common/modal/delivery_rule_modal.html

@@ -12,7 +12,7 @@
         margin: -145px 0 0 -77px;
     }
     .com-del-box{
-        height: 155px;
+        height: 161px;
         width: 290px;
     }
     .com-del-box .title {

src/main/webapp/resources/view/vendor/forstore/vendor_upload.html

@@ -79,6 +79,11 @@
         text-decoration: none;
         height: 31px;
     }
+    .ng-table-pagination .page-a:hover {
+        border: 1px solid #5078cb !important;
+        background: #5078cb !important;
+        color: #fff !important;
+    }
 
     div.ng-table-pager div.page-go-block {
         float: right;