Merge remote-tracking branch 'origin/master'

Pu Zhibing

2024-11-27 64a71565792d4f2e9fd31eab6e98e972c12daa86

 ruoyi-api/ruoyi-api-order/src/main/java/model/Order.java

@@ -84,6 +84,10 @@
    @TableField("express_json")
    private String expressJson;

    @ApiModelProperty(value = "收货地址信息")
    @TableField("address_json")
    private String addressJson;

    @ApiModelProperty(value = "平台分佣")
    @TableField("share_amount")
    private BigDecimal shareAmount;