Merge remote-tracking branch 'origin/1.0.1' into 1.0.1

nidapeng

2024-04-03 5792e36950d6699aa6b52122d84770051213c141

 server/service/src/main/java/com/doumee/dao/business/model/UnionChange.java

@@ -97,6 +97,12 @@
    @ExcelColumn(name="合并保单主键")
    private Integer unionApplyId;



    @ApiModelProperty(value = "变更费用")
    @TableField(exist = false)
    private BigDecimal fee;

    @ApiModelProperty(value = "商户名称")
    @TableField(exist = false)
    private String shopName;