Merge remote-tracking branch 'origin/master'

jinpengyong

2020-11-23 8bb914874ef1ebcda2a9c606224bf3e3db2f46f8

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

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

@Data
public class Area {

    @Id
    private Integer areaCode;