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

无关风月

2025-04-21 1668fe1b912d07191c9fd7f20808d7d2162bc8e8

 ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/request/OrderRequest.java

@@ -19,6 +19,8 @@

    @ApiModelProperty("下单城市")
    private String city;
    private String provinceCode;
    private String areaCode;

    @ApiModelProperty("城市编码")
    private String cityCode;