Merge remote-tracking branch 'origin/master'

This commit is contained in:
majintao
2024-09-03 13:17:13 +08:00
@@ -271,10 +271,11 @@ public class AddrSvcController {
public Object suggestionAction(AddressModel model) {
RestfulModelAndView mav = new RestfulModelAndView();
if (StringUtils.isBlank(model.getCity())) {
mav.setModel(BasicModel.buildBadRequestModel("城市不能为空"));
return mav;
}
// 城市改为非必填
// if (StringUtils.isBlank(model.getCity())) {
// mav.setModel(BasicModel.buildBadRequestModel("城市不能为空"));
// return mav;
// }
if (StringUtils.isBlank(model.getKeywords())) {
mav.setModel(BasicModel.buildBadRequestModel("关键字不能为空"));
return mav;