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

jiaosong

2023-10-17 7ec37d4b36111c0192f2c7674b07f8dd1daf1d53

 server/services/src/main/java/com/doumee/dao/business/model/PricingDetail.java

@@ -106,4 +106,9 @@
    @ExcelColumn(name="规则名称")
    private String title;

    @ApiModelProperty(value = "排序码（升序）", example = "1")
    @ExcelColumn(name="排序码（升序）")
    @TableField(exist = false)
    private Integer sortnum;

}