Jiaju Zhuang
|
2ef2135c5e
|
Merge branch 'developing' into master
|
3 years ago |
Jiaju Zhuang
|
e5b579fdfa
|
修复头和数据对象不一致会覆盖的问题 [Issue #1870]
|
3 years ago |
Jiaju Zhuang
|
dac1b4de0e
|
Merge branch 'bugfix' into developing
# Conflicts:
# src/main/java/com/alibaba/excel/write/executor/ExcelWriteAddExecutor.java
|
3 years ago |
Jiaju Zhuang
|
dc7d939c6c
|
Merge pull request #1871 from rockRust/master
Fix bug list classType not same with head type when write
|
3 years ago |
Jiaju Zhuang
|
41d1220c01
|
修复不创建对象写入数据异常 [Issue #1702]
|
3 years ago |
Jiaju Zhuang
|
9d8830cf85
|
Merge branch 'bugfix' into developing
# Conflicts:
# src/main/java/com/alibaba/excel/write/executor/ExcelWriteAddExecutor.java
|
3 years ago |
Jiaju Zhuang
|
51121df987
|
Merge remote-tracking branch 'origin/developing' into developing
|
3 years ago |
Jiaju Zhuang
|
8d5db9f256
|
Merge pull request #1880 from SmireG/bugfix
fix #1702
|
3 years ago |
Jiaju Zhuang
|
c30a89d4f6
|
修改返回行列
|
3 years ago |
Jiaju Zhuang
|
39c9d47d6c
|
Merge pull request #1877 from JackeyXps/master
fix issue#1702 不创建对象的写,无法正常写入数据
|
3 years ago |
Jiaju Zhuang
|
5c7a4abd7e
|
* 修复某些特殊的excel读取失败的问题 [Issue #1595]
|
3 years ago |
Jiaju Zhuang
|
51f222770e
|
修改合并问题
|
3 years ago |
Jiaju Zhuang
|
9988e0d546
|
Merge pull request #1883 from Albert1881/issue1663
fix issue-1663. Skip fill when variable does not exit.
|
3 years ago |
Jiaju Zhuang
|
4346cb43c2
|
* 新增头的非空校验 [Issue #1765]
|
3 years ago |
Jiaju Zhuang
|
3d19a1962e
|
* 新增头的非空校验 [Issue #1765]
|
3 years ago |
Jiaju Zhuang
|
9286b57b1f
|
Merge pull request #1885 from SmireG/bugfix1765
fix #1765
|
3 years ago |
Jiaju Zhuang
|
e67b491f58
|
Merge branch 'developing' into bugfix1765
|
3 years ago |
Jiaju Zhuang
|
6351fe2c18
|
修复不自动行高的问题 [Issue #1869]
|
3 years ago |
Jiaju Zhuang
|
56ab48e364
|
修复不自动行高的问题 [Issue #1869]
|
3 years ago |
Jiaju Zhuang
|
6a17179086
|
修复填充调用横向样式策略报错 [Issue #1651]
|
3 years ago |
Jiaju Zhuang
|
f9714da123
|
Merge branch 'bugfix' into developing
# Conflicts:
# src/main/java/com/alibaba/excel/write/style/HorizontalCellStyleStrategy.java
|
3 years ago |
Jiaju Zhuang
|
bc4ba98d58
|
修复填充调用横向样式策略报错 [Issue #1651]
|
3 years ago |
Jiaju Zhuang
|
dfca139885
|
Merge pull request #1923 from zjr2000/bugfix
fix #1651:使用模板填充导出的时候设置自动换行报错
|
3 years ago |
Jiaju Zhuang
|
3f2f21f955
|
修复合并头可能异常的bug
|
3 years ago |
Jiaju Zhuang
|
669508ba3c
|
Merge pull request #1940 from lethal233/bugfix-1662
Bugfix #1662
|
3 years ago |
Jiaju Zhuang
|
59d72a723e
|
修改合并异常
|
3 years ago |
Jiaju Zhuang
|
3fadb3936e
|
Merge branch 'bugfix' into developing
# Conflicts:
# src/main/java/com/alibaba/excel/write/executor/ExcelWriteFillExecutor.java
|
3 years ago |
Jiaju Zhuang
|
3aa18351c0
|
Merge pull request #1968 from realhht/master
fix issue 1967
|
3 years ago |
Jiaju Zhuang
|
beebbdd348
|
Merge branch 'bugfix' into developing
# Conflicts:
# src/main/java/com/alibaba/excel/write/executor/AbstractExcelWriteExecutor.java
# src/main/java/com/alibaba/excel/write/executor/ExcelWriteAddExecutor.java
# src/test/java/com/alibaba/easyexcel/test/core/compatibility/CompatibilityDataTest.java
|
3 years ago |
Jiaju Zhuang
|
50ff4db89f
|
Merge pull request #1974 from lethal233/comment_typo_fix
fix typo in comments
|
3 years ago |
Jiaju Zhuang
|
4af4ea8b19
|
Merge branch 'bugfix' into comment_typo_fix
|
3 years ago |
Jiaju Zhuang
|
2433e99dca
|
Merge branch 'bugfix' into developing
|
3 years ago |
Jiaju Zhuang
|
aaf4504981
|
Merge pull request #1972 from boatrainlsz/master
fix grammar errors
|
3 years ago |
Jiaju Zhuang
|
5aede698ea
|
修改读取07注释的写法
|
3 years ago |
Jiaju Zhuang
|
086721a60f
|
Merge branch 'bugfix' into developing
# Conflicts:
# pom.xml
# src/test/java/com/alibaba/easyexcel/test/temp/Lock2Test.java
|
3 years ago |
Jiaju Zhuang
|
3bfb78f512
|
Merge pull request #2017 from xiaoming2012-lab/master
升级poi到5.0.0
|
3 years ago |
Jiaju Zhuang
|
2dabf6cce3
|
修改合并异常
|
3 years ago |
Jiaju Zhuang
|
aad90c6e8b
|
Merge pull request #1976 from Hccake/bugfix-EncryptedExcelCorrupted
🐛 fix 当进行加密导出时,由于输出流未关闭导致的文件损坏异常
|
3 years ago |
Jiaju Zhuang
|
59ea5a27b3
|
Merge branch 'developing' into bugfix-EncryptedExcelCorrupted
|
3 years ago |
Jiaju Zhuang
|
041b25abe6
|
修改合并异常
|
3 years ago |
Jiaju Zhuang
|
d3cf3e5033
|
Merge pull request #1995 from seven4x/bugfix
initSheet catch exception避免哑处理异常输出错误日志便于异常排错
|
3 years ago |
Jiaju Zhuang
|
658df4f2f5
|
Merge branch 'developing' into bugfix
|
3 years ago |
Jiaju Zhuang
|
c6915a469c
|
修复无对象读 返回map的size可能会头的size不一致 [Issue #2014]
|
3 years ago |
Jiaju Zhuang
|
d3f6cbbf86
|
Merge pull request #2019 from smart-techs/fix-2014
fix issue-2014
|
3 years ago |
Jiaju Zhuang
|
71f60a76df
|
Merge branch 'developing' into fix-2014
|
3 years ago |
Jiaju Zhuang
|
153d4c6e20
|
移除弃用代码
|
3 years ago |
Jiaju Zhuang
|
bdba8a41d4
|
修改代码为jdk8
|
3 years ago |
Jiaju Zhuang
|
6407a8abca
|
修改填充可能填充错误的bug #2035
|
3 years ago |
Jiaju Zhuang
|
111d6e0a42
|
Merge pull request #2036 from duanqiaoyanyu/bugfix
fix issue 2035
|
3 years ago |
Jiaju Zhuang
|
d1490ee2d0
|
Merge branch 'developing' into bugfix
|
3 years ago |