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

@@ -165,7 +165,7 @@
     * 活动id
     */
    @TableField("activity_id")
    private Long activityId;
    private String activityId;

    /**
     * 活动名称
@@ -173,6 +173,13 @@
    @TableField("activity_name")
    private String activityName;

    /**
     * 应收金额
     */
    @TableField("change_receivable_money")
    private BigDecimal changeReceivableMoney;


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