Merge remote-tracking branch 'origin/master'

@@ -109,7 +109,7 @@
   </select>
 
   <select id="selectStoragePriceCount" resultType="java.lang.Integer">
-    select count(*) from from storage_price where <include refid="skupPageCondition2" />
+    select count(*) from storage_price where <include refid="skupPageCondition2" />
   </select>
 
   <select id="selectStoragePriceList" resultMap="BaseResultMap">

@@ -46,7 +46,7 @@ $.ajaxSetup({
 					text : "重新登录",
 					iconCls : "icon-no",
 					handler : function() {
-						window.top.location.href = "http://admin.portal.yohobuy.com/login";
+						window.top.location.href = "http://java-ufo-platform.test3.ingress.dev.yohocorp.com/ufoPlatform/html/login.html";
 					}
 				}]
 			});