Merge remote-tracking branch 'origin/2.0' into 2.0

luofl

2025-04-11 a9edc2f62628007e2c5e86d416d484780238f13f

1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
package com.dsh.activity.feignclient.other.model;
 
 
import lombok.Data;
 
@Data
public class CityDataAndProvinceDataVo {
 
    String cityName;
 
    String cityCode;
 
    String provinceName;
 
    String provinceCode;
 
}