superman
0da59dcccc
Merge pull request #1928 in CORE/base-third from release/10.0 to bugfix/10.0
...
* commit '0f226385bb87d4d88c168dea6896840c7e0025a6':
DEC-17331 fix: 裁掉spring对jackson的部分支持
4 years ago
superman
0f226385bb
Merge pull request #1927 in CORE/base-third from final/10.0 to release/10.0
...
* commit 'faa5c6320031c6f3b89f17a6fe5b5fd50aeb66ff':
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
dfab5476db
Merge pull request #1925 in CORE/base-third from bugfix/10.0 to release/10.0
...
* commit '6a8d3477da096b7bbad9f0570451fa02c9aa69b8':
REPORT-47816 在某些字体、字号下,导出pdf文字会有一个黑边(REPORT-29126 改动导致)
4 years ago
Niko
ce0f73ec5c
Pull request #1907 : DEC-17331 fix: 裁掉spring对jackson的部分支持
...
Merge in CORE/base-third from ~NIKO/base-third:release/10.0 to release/10.0
* commit 'e65bab63eaf66be69444522e0bcda9632c9eaec8':
DEC-17331 fix: 裁掉spring对jackson的部分支持
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
superman
68426ef00f
Merge pull request #1922 in CORE/base-third from feature/10.0 to research/10.0
...
* commit 'd7f108a7f12afe060e85d16de9176fe8bfbb42ce':
无JIRA任务 feat: CBB增加分支
无JIRA任务 fix: 修改third打包脚本
无JIRA任务 fix: 修改third打包脚本
4 years ago
superman
d7f108a7f1
Merge pull request #1921 in CORE/base-third from bugfix/10.0 to feature/10.0
...
* commit '6a8d3477da096b7bbad9f0570451fa02c9aa69b8':
无JIRA任务 feat: CBB增加分支
无JIRA任务 fix: 修改third打包脚本
无JIRA任务 fix: 修改third打包脚本
4 years ago
superman
6a8d3477da
Merge pull request #1920 in CORE/base-third from release/10.0 to bugfix/10.0
...
* commit '952d29a2629b1f1d3db98889d3fd133362b7b705':
无JIRA任务 feat: CBB增加分支
无JIRA任务 fix: 修改third打包脚本
无JIRA任务 fix: 修改third打包脚本
4 years ago
superman
952d29a262
Merge pull request #1919 in CORE/base-third from final/10.0 to release/10.0
...
* commit 'eeb392d30f2086f2921fa219ebe1e25e1701379b':
无JIRA任务 feat: CBB增加分支
无JIRA任务 fix: 修改third打包脚本
4 years ago
superman
ac43c35c5e
Merge pull request #1916 in CORE/base-third from feature/10.0 to research/10.0
...
* commit '994ebb652788f0bfd8895ddf7778e586e9df9c64':
无jira任务 chore: 解决bugfix合并到feature的冲突
DEC-17254 feat: 升级Spring至4.3.29
4 years ago
superman
994ebb6527
Merge pull request #1911 in CORE/base-third from bugfix/10.0 to feature/10.0
...
* commit 'df016ab9e92c0096d1c84b4a53b870431cae1d6d':
DEC-17254 feat: 升级Spring至4.3.29
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
Cloud.Liu
827c207b3b
Pull request #1913 : 无JIRA任务 fix: 修改third打包脚本
...
Merge in CORE/base-third from ~CLOUD.LIU/base-third:release/10.0 to release/10.0
* commit 'e1858782910095d512c950d17bd49fa514d8f8d8':
无JIRA任务 fix: 修改third打包脚本
4 years ago
Cloud.Liu
e185878291
无JIRA任务 fix: 修改third打包脚本
4 years ago
Niko
44b7865db5
Pull request #1912 : 无jira任务 chore: 解决bugfix合并到feature的冲突
...
Merge in CORE/base-third from ~NIKO/base-third:feature/10.0 to feature/10.0
* commit '2f7700fd6d40f0b3521db8944a78a84b38b72f0f':
无jira任务 chore: 解决bugfix合并到feature的冲突
4 years ago
charile_Lu
2f7700fd6d
无jira任务 chore: 解决bugfix合并到feature的冲突
4 years ago
superman
df016ab9e9
Merge pull request #1910 in CORE/base-third from release/10.0 to bugfix/10.0
...
* commit '81247801b0a37095171eda7ae2373a8b7709ead1':
DEC-17254 feat: 升级Spring至4.3.29
4 years ago
charile_Lu
e65bab63ea
DEC-17331 fix: 裁掉spring对jackson的部分支持
4 years ago
Niko
81247801b0
Pull request #1839 : DEC-17254 feat: 升级Spring至4.3.29
...
Merge in CORE/base-third from ~NIKO/base-third:release/10.0 to release/10.0
* commit '7fc2c0f87906ac20099f82554e6bfdb7ddadfafc':
DEC-17254 feat: 升级Spring至4.3.29
4 years ago
superman
337b97d4de
Merge pull request #1905 in CORE/base-third from feature/10.0 to research/10.0
...
* commit '6df48738045be1e2dacbba2917c305287685f755':
无JIRA任务 feat: CBB增加分支
4 years ago
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
bdab3081ee
Merge pull request #1880 in CORE/base-third from feature/10.0 to research/10.0
...
* commit '8e2ed2e1d56fabd3eb44b55113a75d06e499f761':
REPORT-47068 【定时调度】定时调度数据有误,定时调度传参数是正常的,报表计算出问题了
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
f24f8b7dd8
Merge pull request #1867 in CORE/base-third from feature/10.0 to research/10.0
...
* commit 'ca8da13bf19a81babe902047b5c3f6caa4ab6170':
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
c45622b94b
Merge pull request #1837 in CORE/base-third from feature/10.0 to research/10.0
...
* commit '39914965a268196669829df684b80a67bfa52e0a':
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
2af54fcfa6
Merge pull request #1823 in CORE/base-third from feature/10.0 to research/10.0
...
* commit 'aa5df921dc14b6db6a2e32cd3943f242521cc26f':
无JIRA任务 feat: fine-sql加入fine-third release分支打包
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