Merge remote-tracking branch 'origin/master'

jinpengyong

2021-10-12 f060b03b65806b8ab1b869459942fa1f20641c9b

 src/main/java/com/moral/entity/City.java

@@ -6,6 +6,7 @@

@Data
public class City {

    @Id
    private Integer cityCode;