Merge branch 'dev-new' into dev-new-rabbitmq

# Conflicts:
#	jsowell-admin/src/test/java/SpringBootTestController.java
#	jsowell-pile/src/main/java/com/jsowell/pile/service/OrderBasicInfoService.java
#	jsowell-pile/src/main/java/com/jsowell/pile/service/impl/OrderBasicInfoServiceImpl.java

jsowell-pile/src/main/java/com/jsowell/pile/domain/AreaCodeInfo.java

@@ -0,0 +1,203 @@
+package com.jsowell.pile.domain;
+
+import java.math.BigDecimal;
+
+import com.jsowell.common.annotation.Excel;
+import com.jsowell.common.core.domain.BaseEntity;
+import org.apache.commons.lang3.builder.ToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
+
+/**
+ * 中国行政地区对象 area_code_info
+ *
+ * @author jsowell
+ * @date 2024-12-20
+ */
+public class AreaCodeInfo extends BaseEntity {
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * $column.columnComment
+     */
+    private Integer id;
+
+    /**
+     * 层级
+     */
+    @Excel(name = "层级")
+    private Integer level;
+
+    /**
+     * 父级行政代码
+     */
+    @Excel(name = "父级行政代码")
+    private Long parentCode;
+
+    /**
+     * 行政代码
+     */
+    @Excel(name = "行政代码")
+    private Long areaCode;
+
+    /**
+     * 邮政编码
+     */
+    @Excel(name = "邮政编码")
+    private Integer zipCode;
+
+    /**
+     * 区号
+     */
+    @Excel(name = "区号")
+    private String cityCode;
+
+    /**
+     * 名称
+     */
+    @Excel(name = "名称")
+    private String name;
+
+    /**
+     * 简称
+     */
+    @Excel(name = "简称")
+    private String shortName;
+
+    /**
+     * 组合名
+     */
+    @Excel(name = "组合名")
+    private String mergerName;
+
+    /**
+     * 拼音
+     */
+    @Excel(name = "拼音")
+    private String pinyin;
+
+    /**
+     * 经度
+     */
+    @Excel(name = "经度")
+    private BigDecimal lng;
+
+    /**
+     * 纬度
+     */
+    @Excel(name = "纬度")
+    private BigDecimal lat;
+
+    public void setId(Integer id) {
+        this.id = id;
+    }
+
+    public Integer getId() {
+        return id;
+    }
+
+    public void setLevel(Integer level) {
+        this.level = level;
+    }
+
+    public Integer getLevel() {
+        return level;
+    }
+
+    public void setParentCode(Long parentCode) {
+        this.parentCode = parentCode;
+    }
+
+    public Long getParentCode() {
+        return parentCode;
+    }
+
+    public void setAreaCode(Long areaCode) {
+        this.areaCode = areaCode;
+    }
+
+    public Long getAreaCode() {
+        return areaCode;
+    }
+
+    public void setZipCode(Integer zipCode) {
+        this.zipCode = zipCode;
+    }
+
+    public Integer getZipCode() {
+        return zipCode;
+    }
+
+    public void setCityCode(String cityCode) {
+        this.cityCode = cityCode;
+    }
+
+    public String getCityCode() {
+        return cityCode;
+    }
+
+    public void setName(String name) {
+        this.name = name;
+    }
+
+    public String getName() {
+        return name;
+    }
+
+    public void setShortName(String shortName) {
+        this.shortName = shortName;
+    }
+
+    public String getShortName() {
+        return shortName;
+    }
+
+    public void setMergerName(String mergerName) {
+        this.mergerName = mergerName;
+    }
+
+    public String getMergerName() {
+        return mergerName;
+    }
+
+    public void setPinyin(String pinyin) {
+        this.pinyin = pinyin;
+    }
+
+    public String getPinyin() {
+        return pinyin;
+    }
+
+    public void setLng(BigDecimal lng) {
+        this.lng = lng;
+    }
+
+    public BigDecimal getLng() {
+        return lng;
+    }
+
+    public void setLat(BigDecimal lat) {
+        this.lat = lat;
+    }
+
+    public BigDecimal getLat() {
+        return lat;
+    }
+
+    @Override
+    public String toString() {
+        return new ToStringBuilder(this, ToStringStyle.JSON_STYLE)
+                .append("id", getId())
+                .append("level", getLevel())
+                .append("parentCode", getParentCode())
+                .append("areaCode", getAreaCode())
+                .append("zipCode", getZipCode())
+                .append("cityCode", getCityCode())
+                .append("name", getName())
+                .append("shortName", getShortName())
+                .append("mergerName", getMergerName())
+                .append("pinyin", getPinyin())
+                .append("lng", getLng())
+                .append("lat", getLat())
+                .toString();
+    }
+}