Merge branch 'master' of ssh://sinata.cn:20202/java/HongRuiTang into master

jiangqs

2023-07-26 0b806dd3c5159d8fac767cf027b0301e583d1161

 ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/domain/pojo/order/Order.java

@@ -179,6 +179,7 @@
    @TableField("change_receivable_money")
    private BigDecimal changeReceivableMoney;


    @Override
    protected Serializable pkVal() {
        return this.orderId;