superman
2f0674ee4d
Merge pull request #1975 in CORE/base-third from persist/10.0 to final/10.0
...
* commit '41598289f4812bfb28375deac38fcb2cf18c6a45':
4 years ago
superman
41598289f4
Merge pull request #1974 in CORE/base-third from final/10.0 to persist/10.0
...
* commit '2698dbb22a393db4ef70066536b22f2a389ea20e':
REPORT-47068 【定时调度】定时调度数据有误,定时调度传参数是正常的,报表计算出问题了
4 years ago
Kara
2698dbb22a
Pull request #1930 : REPORT-47068 【定时调度】定时调度数据有误,定时调度传参数是正常的,报表计算出问题了
...
Merge in CORE/base-third from ~LANLAN/base-third:final/10.0 to final/10.0
* commit 'b7468492e8ccd5154c0edb5b0450312529b815fb':
REPORT-47068 【定时调度】定时调度数据有误,定时调度传参数是正常的,报表计算出问题了
4 years ago
Lanlan
b7468492e8
REPORT-47068 【定时调度】定时调度数据有误,定时调度传参数是正常的,报表计算出问题了
4 years ago
superman
faa5c63200
Merge pull request #1926 in CORE/base-third from persist/10.0 to final/10.0
...
* commit '7480a0fa10742d54227b52067b5e6b38575b150c':
4 years ago
superman
7480a0fa10
Merge pull request #1924 in CORE/base-third from final/10.0 to persist/10.0
...
* commit 'eeb392d30f2086f2921fa219ebe1e25e1701379b':
无JIRA任务 feat: CBB增加分支
无JIRA任务 fix: 修改third打包脚本
4 years ago
Kara
eeb392d30f
Pull request #1915 : 无JIRA任务 feat: CBB增加分支
...
Merge in CORE/base-third from ~CLOUD.LIU/base-third:final/10.0 to final/10.0
* commit 'e0c248297a46a5acfe9130495c87198caf6a41f7':
无JIRA任务 feat: CBB增加分支
4 years ago
Cloud.Liu
e0c248297a
无JIRA任务 feat: CBB增加分支
4 years ago
Kara
ff7c1ec8d7
Pull request #1914 : 无JIRA任务 fix: 修改third打包脚本
...
Merge in CORE/base-third from ~CLOUD.LIU/base-third:final/10.0 to final/10.0
* commit '291983e33344d48fb07901618a0be82b7513daff':
无JIRA任务 fix: 修改third打包脚本
4 years ago
Cloud.Liu
291983e333
无JIRA任务 fix: 修改third打包脚本
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
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
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
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
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
c1a15da808
Merge pull request #1733 in CORE/base-third from bugfix/10.0 to release/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
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
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
superman
587286a6cd
Merge pull request #1583 in CORE/base-third from final/10.0 to release/10.0
...
* commit 'b3045dca58075cec8bc9342ba7a0dbcf9c2edc7f':
4 years ago
superman
b3045dca58
Merge pull request #1581 in CORE/base-third from release/10.0 to final/10.0
...
* commit '216f0efb32dfcee8a86f8c8b38bba580c3b5e302':
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
eason
216f0efb32
Pull request #1580 : 解决冲突
...
Merge in CORE/base-third from ~BJORN/base-third:release/10.0 to release/10.0
* commit '8a5d6e364d287a6695eac4077d64f283eb486417':
REPORT-46819 release→final
release→final
4 years ago
白岳
8a5d6e364d
解决冲突
4 years ago
superman
3e3d5d6dbd
Merge pull request #1578 in CORE/base-third from persist/10.0 to final/10.0
...
* commit '6d68c2ce70cbecd61facf6c5efb6138d3d9d41a2':
4 years ago
superman
6d68c2ce70
Merge pull request #1577 in CORE/base-third from final/10.0 to persist/10.0
...
* commit '6246816a4f57a0e34bcd5ad6f05b5cab64c44d07':
REPORT-46819 release→final
release→final
4 years ago
Kara
6246816a4f
Pull request #1576 : REPORT-46819 release→final
...
Merge in CORE/base-third from ~BJORN/base-third:final/10.0 to final/10.0
* commit '995a7f1f8a6988fe1be1964a777158791201ff54':
REPORT-46819 release→final
4 years ago
白岳
995a7f1f8a
REPORT-46819 release→final
4 years ago
Kara
f30ba0fa85
Pull request #1575 : release→final
...
Merge in CORE/base-third from ~BJORN/base-third:final/10.0 to final/10.0
* commit 'bba8ea320ee87408ed81053e4f200822c6c59149':
release→final
4 years ago
白岳
bba8ea320e
release→final
4 years ago
eason
3e39f8fed9
Pull request #1574 : REPORT-46819 死循环风险
...
Merge in CORE/base-third from ~BJORN/base-third:release/10.0 to release/10.0
* commit '00d2a9971bf071c50fd677f7cf39e0ccdbe8753a':
REPORT-46819 死循环风险
4 years ago
白岳
00d2a9971b
Merge branch 'release/10.0' of https://cloud.finedevelop.com/scm/~bjorn/base-third into release/10.0
4 years ago
白岳
2388034eb2
REPORT-46819 死循环风险
4 years ago
eason
79a7fafe4b
Pull request #1573 : REPORT-46819 win7下加载j2v8dll之后程序无法退出
...
Merge in CORE/base-third from ~BJORN/base-third:release/10.0 to release/10.0
* commit '95273a6c6751b8cb97d59a3304928a6328bc2c14':
代码质量
代码质量
REPORT-46819 win7下加载j2v8dll之后程序无法退出
4 years ago
白岳
95273a6c67
代码质量
4 years ago
白岳
e9ac0239ef
代码质量
4 years ago
白岳
a3bee18d42
REPORT-46819 win7下加载j2v8dll之后程序无法退出
4 years ago
superman
1cb133193e
Merge pull request #1565 in CORE/base-third from release/10.0 to bugfix/10.0
...
* commit '89e11361b0dcb7e4fc4dbc3266eabd61fd223e63':
4 years ago
superman
89e11361b0
Merge pull request #1564 in CORE/base-third from final/10.0 to release/10.0
...
* commit 'eb2d35665f4ea9268083f929e478dfa27a9cde10':
4 years ago
superman
eb2d35665f
Merge pull request #1563 in CORE/base-third from persist/10.0 to final/10.0
...
* commit 'b023797508c442cbb080b933b53e3aae54833adf':
4 years ago
superman
b023797508
Merge pull request #1562 in CORE/base-third from final/10.0 to persist/10.0
...
* commit '4790b8cb470246d64e58c5dd84be0cbbe9ca1e82':
4 years ago