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

hongjli

2025-05-23 48f5220bc5eb826402f43e440dc34867368ff17c

 aps-common/aps-common-core/src/main/java/com/aps/common/core/utils/poi/ExcelUtil.java

@@ -1316,7 +1316,7 @@
    /**
     * 得到所有定义字段
     */
    private void createExcelField()
    public void createExcelField()
    {
        this.fields = getFields();
        this.fields = this.fields.stream().sorted(Comparator.comparing(objects -> ((Excel) objects[1]).sort())).collect(Collectors.toList());