Merge remote-tracking branch 'origin/master-prod-new' into master-prod-new

fwq

2024-02-22 05e9aa8a610932d706d48257a36e95cec9de39fa

 phis-feign/src/main/java/com/hz/his/dto/order/OrdersPHisTotalDto.java

@@ -1,7 +1,5 @@
package com.hz.his.dto.order;

import com.gitee.sunchenbin.mybatis.actable.annotation.Column;
import com.gitee.sunchenbin.mybatis.actable.constants.MySqlTypeConstant;
import lombok.Data;

import java.math.BigDecimal;
@@ -112,5 +110,6 @@
    private Integer activityPageType = 0;
    /**活动区分编号-用于一次性活动，存储活动编号，便于查找*/
    private String activityPageCode;

    /**活动区分标题*/
    private String activityPageName;
}