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

无关风月

2 天以前 3044a637a15e09d50ad733fd482c6e64e90df2f9

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

@@ -14,9 +14,16 @@
 */
@Data
public class OrderRequest {
    @ApiModelProperty("订单id")
    private String orderId;

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

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

    @ApiModelProperty("订单编号")
    private String orderNumber;