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

jiangqs

2023-08-03 cc1181b93c51c60a117846f9640d3f56370e67f3

 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;