Merge branch 'open_gj' into 'master'

update

See merge request !209
This commit is contained in:
2021-12-02 11:36:55 +08:00
2 changed files with 2 additions and 2 deletions
@@ -85,7 +85,7 @@ public class UserController {
try {
if(StringUtils.isNotBlank(weiXinId) && StringUtils.isNotBlank(cacheWeiXinId)){
System.out.println("cookie weiXinId:"+weiXinId);
response.sendRedirect("reqCityChoicePage?type=bh&code="+model.getCode());
response.sendRedirect("reqCityChoicePage?type=b&code="+model.getCode());
}
} catch (IOException e) {
e.printStackTrace();
@@ -54,7 +54,7 @@
</#list>
</div>
</#if>
<#if type?? && type == 'c' || type == 'b' || type=='bh' && (citys??&&citys?size=0)>
<#if type?? && type == 'c' || type == 'b' && (citys??&&citys?size=0)>
<div class="city-list curCity">
<span class="city-letter" id="Cur">当前定位城市</span>
</div>