superman
6df4873804
Merge pull request #1904 in CORE/base-third from bugfix/10.0 to feature/10.0
...
* commit 'c7f362827c7fa754048675a59993dc885913f529':
无JIRA任务 feat: CBB增加分支
4 years ago
superman
c7f362827c
Merge pull request #1903 in CORE/base-third from release/10.0 to bugfix/10.0
...
* commit '9019b0e25692bb815858d7a263670f367e83185c':
无JIRA任务 feat: CBB增加分支
4 years ago
Cloud.Liu
9019b0e256
Pull request #1900 : 无JIRA任务 feat: CBB增加分支
...
Merge in CORE/base-third from ~CLOUD.LIU/base-third:release/10.0 to release/10.0
* commit 'fc00df46f295508c84771500d0434c35d31da3f3':
无JIRA任务 feat: CBB增加分支
4 years ago
Cloud.Liu
fc00df46f2
无JIRA任务 feat: CBB增加分支
4 years ago
superman
8e2ed2e1d5
Merge pull request #1879 in CORE/base-third from bugfix/10.0 to feature/10.0
...
* commit '8385ab4a9efd83ec3e335046d5e26978092e3eda':
REPORT-47068 【定时调度】定时调度数据有误,定时调度传参数是正常的,报表计算出问题了
4 years ago
superman
8385ab4a9e
Merge pull request #1878 in CORE/base-third from release/10.0 to bugfix/10.0
...
* commit 'c5d25dfb66ee92fcaece13a45791f9e23a551586':
REPORT-47068 【定时调度】定时调度数据有误,定时调度传参数是正常的,报表计算出问题了
4 years ago
Lanlan
c5d25dfb66
Pull request #1869 : REPORT-47068 【定时调度】定时调度数据有误,定时调度传参数是正常的,报表计算出问题了
...
Merge in CORE/base-third from ~LANLAN/base-third:release/10.0 to release/10.0
* commit '039979fb1e75f95add13b48e5783c3914477a476':
REPORT-47068 【定时调度】定时调度数据有误,定时调度传参数是正常的,报表计算出问题了
4 years ago
Lanlan
039979fb1e
REPORT-47068 【定时调度】定时调度数据有误,定时调度传参数是正常的,报表计算出问题了
4 years ago
superman
ca8da13bf1
Merge pull request #1866 in CORE/base-third from bugfix/10.0 to feature/10.0
...
* commit '6852991da788fb94c8a8e8069073c46c8adb0709':
4 years ago
superman
6852991da7
Merge pull request #1865 in CORE/base-third from release/10.0 to bugfix/10.0
...
* commit 'b19a229d3934de4ebe379e47cd53cec2071487fb':
4 years ago
superman
b19a229d39
Merge pull request #1864 in CORE/base-third from final/10.0 to release/10.0
...
* commit 'b10fd4df2e4772a08196b5ece60612232206badb':
4 years ago
superman
b10fd4df2e
Merge pull request #1863 in CORE/base-third from persist/10.0 to final/10.0
...
* commit '41b3ed930072e6565b303bce91192bd7a103ce9e':
4 years ago
superman
41b3ed9300
Merge pull request #1862 in CORE/base-third from final/10.0 to persist/10.0
...
* commit 'de4f4b9a2a0caf73e00932b2896552209662311b':
无JIRA任务 feat: fine-sql加入fine-third release分支打包
DEC-17219 revert: 先不把fine-sql打入fine-third
DEC-17219 feat: 转SQL合并到release third
4 years ago
charile_Lu
7fc2c0f879
Merge branch 'release/10.0' of ssh://code.fineres.com:7999/~niko/base-third into release/10.0
...
merge
4 years ago
Cloud.Liu
b50cd06c0a
DEC-17254 feat: 升级Spring至4.3.29
4 years ago
superman
39914965a2
Merge pull request #1836 in CORE/base-third from bugfix/10.0 to feature/10.0
...
* commit '24923f88b8a5dc34a0ffa0fe34c8f1ec5536bebd':
4 years ago
superman
24923f88b8
Merge pull request #1835 in CORE/base-third from release/10.0 to bugfix/10.0
...
* commit 'ec44d4f5bc5f6c78c7dece6e0455893e640952b0':
4 years ago
superman
ec44d4f5bc
Merge pull request #1834 in CORE/base-third from final/10.0 to release/10.0
...
* commit 'de4f4b9a2a0caf73e00932b2896552209662311b':
4 years ago
superman
de4f4b9a2a
Merge pull request #1829 in CORE/base-third from release/10.0 to final/10.0
...
* commit '1036482c4467ff65a0fe15f5d10b00fb70243373':
无JIRA任务 feat: fine-sql加入fine-third release分支打包
DEC-17219 revert: 先不把fine-sql打入fine-third
DEC-17219 feat: 转SQL合并到release third
4 years ago
superman
aa5df921dc
Merge pull request #1822 in CORE/base-third from bugfix/10.0 to feature/10.0
...
* commit 'ed7d4bb77cfe34eaf4dde11dcb57952cac72f756':
无JIRA任务 feat: fine-sql加入fine-third release分支打包
4 years ago
superman
ed7d4bb77c
Merge pull request #1821 in CORE/base-third from release/10.0 to bugfix/10.0
...
* commit '1036482c4467ff65a0fe15f5d10b00fb70243373':
无JIRA任务 feat: fine-sql加入fine-third release分支打包
4 years ago
Cloud.Liu
1036482c44
Pull request #1817 : 无JIRA任务 feat: fine-sql加入fine-third release分支打包
...
Merge in CORE/base-third from ~CLOUD.LIU/base-third:release/10.0 to release/10.0
* commit 'e4aa493aea4483b831990946f33ddf6355b57243':
无JIRA任务 feat: fine-sql加入fine-third release分支打包
4 years ago
Cloud.Liu
e4aa493aea
无JIRA任务 feat: fine-sql加入fine-third release分支打包
4 years ago
superman
41556ee6f9
Merge pull request #1814 in CORE/base-third from bugfix/10.0 to feature/10.0
...
* commit '0f23c728508c4906d8b04647de0157a5981de317':
REPORT-47816 在某些字体、字号下,导出pdf文字会有一个黑边(REPORT-29126 改动导致)
4 years ago
Hugh.C
0f23c72850
Pull request #1810 : REPORT-47816 在某些字体、字号下,导出pdf文字会有一个黑边(REPORT-29126 改动导致)
...
Merge in CORE/base-third from ~HUGH.C/base-third:bugfix/10.0 to bugfix/10.0
* commit '18d1f122458dbab3fb38c4bd73bfa69a22b5dec0':
REPORT-47816 在某些字体、字号下,导出pdf文字会有一个黑边(REPORT-29126 改动导致)
4 years ago
Hugh.C
18d1f12245
REPORT-47816 在某些字体、字号下,导出pdf文字会有一个黑边(REPORT-29126 改动导致)
4 years ago
superman
f18915e59a
Merge pull request #1795 in CORE/base-third from bugfix/10.0 to feature/10.0
...
* commit '2bba8626b682d66c0c2bbb6aa0cdd5231f0d6b2b':
DEC-17219 revert: 先不把fine-sql打入fine-third
4 years ago
superman
2bba8626b6
Merge pull request #1794 in CORE/base-third from release/10.0 to bugfix/10.0
...
* commit 'c3875d7d49c63e0eb6db5331a022b2e78f60e9b7':
DEC-17219 revert: 先不把fine-sql打入fine-third
4 years ago
Cloud.Liu
c3875d7d49
Pull request #1791 : DEC-17219 revert: 先不把fine-sql打入fine-third
...
Merge in CORE/base-third from ~CLOUD.LIU/base-third:release/10.0 to release/10.0
* commit '84eb5d3700fd555f3424096490cd2ff8b2f24f08':
DEC-17219 revert: 先不把fine-sql打入fine-third
4 years ago
Cloud.Liu
84eb5d3700
DEC-17219 revert: 先不把fine-sql打入fine-third
4 years ago
ju|剧浩宇
df1a815455
Pull request #1788 : DEC-17219 feat: 转SQL合并到release third
...
Merge in CORE/base-third from ~CLOUD.LIU/base-third:feature/10.0 to feature/10.0
* commit '97012294847194f1a1f100c4b03b8762904c36f2':
DEC-17219 feat: 转SQL合并到release third
4 years ago
Cloud.Liu
9701229484
无JIRA任务 fix:解决冲突
4 years ago
superman
fe5cdf1550
Merge pull request #1786 in CORE/base-third from release/10.0 to bugfix/10.0
...
* commit '4ab6203332ca18d45c6d6f9aad1ee9bc3fb2d6a3':
DEC-17219 feat: 转SQL合并到release third
4 years ago
Cloud.Liu
4ab6203332
Pull request #1783 : DEC-17219 feat: 转SQL合并到release third
...
Merge in CORE/base-third from ~CLOUD.LIU/base-third:release/10.0 to release/10.0
* commit '3d84b20a49006390dc49b5df8766570395ea951f':
DEC-17219 feat: 转SQL合并到release third
4 years ago
Cloud.Liu
3d84b20a49
DEC-17219 feat: 转SQL合并到release third
4 years ago
superman
028c27c1ec
Merge pull request #1742 in CORE/base-third from bugfix/10.0 to feature/10.0
...
* commit '32b08eca1f68af9a5028f1247d69b7ada38168d1':
4 years ago
superman
32b08eca1f
Merge pull request #1741 in CORE/base-third from release/10.0 to bugfix/10.0
...
* commit 'c1a15da808319c6a55c4b58cd24bad1b53e7ff96':
4 years ago
superman
c1a15da808
Merge pull request #1733 in CORE/base-third from bugfix/10.0 to release/10.0
...
* commit 'f09ab4779e6d570b5b676a7b4471f78a35c1a49f':
4 years ago
superman
1bd72fefbc
Merge pull request #1695 in CORE/base-third from bugfix/10.0 to feature/10.0
...
* commit 'f09ab4779e6d570b5b676a7b4471f78a35c1a49f':
4 years ago
superman
f09ab4779e
Merge pull request #1694 in CORE/base-third from release/10.0 to bugfix/10.0
...
* commit 'a8e8cdc9857510b9a6454fee41e84a5c95f25385':
4 years ago
superman
a8e8cdc985
Merge pull request #1693 in CORE/base-third from final/10.0 to release/10.0
...
* commit 'ae77c676c8a2389e0ffdfd2588dbf6ced514460c':
4 years ago
superman
ae77c676c8
Merge pull request #1692 in CORE/base-third from persist/10.0 to final/10.0
...
* commit '8cbfe61f60ee838a694ce25c47e94450d22dff71':
4 years ago
superman
8cbfe61f60
Merge pull request #1691 in CORE/base-third from final/10.0 to persist/10.0
...
* commit '805d53bcc95b502023decaebe33a16854a29deb1':
4 years ago
superman
25322027b8
Merge pull request #1668 in CORE/base-third from bugfix/10.0 to feature/10.0
...
* commit 'dcbd6097bc2e11673ce7ec03b267407adc0a425e':
4 years ago
superman
dcbd6097bc
Merge pull request #1667 in CORE/base-third from release/10.0 to bugfix/10.0
...
* commit '151ee249fa8c45f9cab64c22c9aa7062f1bc4b7e':
4 years ago
superman
151ee249fa
Merge pull request #1666 in CORE/base-third from final/10.0 to release/10.0
...
* commit '805d53bcc95b502023decaebe33a16854a29deb1':
4 years ago
superman
805d53bcc9
Merge pull request #1663 in CORE/base-third from persist/10.0 to final/10.0
...
* commit '2823e5f6db78e524f9f2324fef0635d96fd000ef':
4 years ago
superman
2823e5f6db
Merge pull request #1662 in CORE/base-third from final/10.0 to persist/10.0
...
* commit 'b3045dca58075cec8bc9342ba7a0dbcf9c2edc7f':
REPORT-46819 死循环风险
代码质量
代码质量
REPORT-46819 win7下加载j2v8dll之后程序无法退出
KERNEL-6189 feat: 公式组件加入release打包
KERNEL-6189 feat: 基础类库、定时器合并到主体代码
KERNEL-6189 fix: 修复third打包脚本
KERNEL-6189 chore: feature分支fine-third打包加入CBB
KERNEL-6151 fix: fine-third打包脚本修改
KERNEL-6151 feat: fine-third适配fine-essential并加入打包
CHART-17354 修改JNI,增加内存即将溢出的回调,中止JS执行
DEC-16125 fix: 少了一个GMT+12,third包单元测试跑不到,移到decision
DEC-16125 fix: resin和weblogic下存在joda时区加载不到的问题
4 years ago
superman
50b8d3d931
Merge pull request #1588 in CORE/base-third from bugfix/10.0 to feature/10.0
...
* commit '740444be0111caafb80260efe38ada8e0e09dd29':
REPORT-46819 release→final
release→final
REPORT-46819 死循环风险
代码质量
代码质量
REPORT-46819 win7下加载j2v8dll之后程序无法退出
4 years ago
superman
740444be01
Merge pull request #1587 in CORE/base-third from release/10.0 to bugfix/10.0
...
* commit '587286a6cd47753f4436e9bb30e67a96cd20ccff':
REPORT-46819 release→final
release→final
REPORT-46819 死循环风险
代码质量
代码质量
REPORT-46819 win7下加载j2v8dll之后程序无法退出
4 years ago