Merge remote-tracking branch 'origin/master'

Pu Zhibing

2025-04-01 8444084e6aa11efa23287e7f82474ac22378a5c4

 ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/domain/vo/AppPlaceOrderVo.java

@@ -26,6 +26,9 @@
    @ApiModelProperty(value = "订单编号")
    private String orderNo;

    @ApiModelProperty(value = "金额为零无需支付 0否1是")
    private Integer zeroFlag;

    @ApiModelProperty(value = "支付方式1.全款2.订金")
    private Integer payType;