Merge branch 'ICP' into debug

controllers/user_login.go

@@ -1022,7 +1022,7 @@ func (this *UserLoginController) ICPLicense() {
 
 
 	item, e := models.GetBusinessConfByKey("ICPLicense")
-	if e != nil {
+	if e != nil && e.Error() != utils.ErrNoRow() {
 		br.Msg = "获取失败"
 		br.ErrMsg = "获取商家配置失败, Err: " + e.Error()
 		return