Merge branch 'master' of http://120.76.84.145:10101/gitblit/r/java/HongRuiTang

jiangqs

2023-08-06 431dde90aa20f7652092fc0bfa9e6a1a28b06b9f

 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;