Bruce.Deng
f5c89564c9
Pull request #1 : REPORT-50649 导出-生僻字导出问题 Excel导出
...
Merge in ~BRUCE.DENG/base-third from ~JOE.JIANG/base-third:release/10.0 to release/10.0
* commit '8e74c0324a9006a544f1eb74d7fe5c87a6aebe57':
REPORT-50649 导出-生僻字导出问题 Excel导出
4 years ago
Joe.Jiang
8e74c0324a
REPORT-50649 导出-生僻字导出问题 Excel导出
4 years ago
superman
32cdcdb540
Merge pull request #2038 in CORE/base-third from feature/10.0 to feature/x
...
* commit '55f472d00e09b1ab8581db6e52ca934c0d7414d5':
无jira任务 docs: 补充readme
DEC-17895 fix: import fileupload相关类包名错误
DEC-14578 feat: hibernate二级缓存卡顿
DEC-14578 feat: hibernate自动删除旧唯一键
DEC-14578 feat: 使hibernate支持主键的自动更新
DEC-14578 feat: 去掉无用的jetbrain.NotNull依赖, 拆分Utils方法
QFX-1737 fix:数据上传之后报错
DEC-14578 打包脚本
DEC-14578 引入com.alibaba:transmittable-thread-local
4 years ago
superman
55f472d00e
Merge pull request #2036 in CORE/base-third from release/10.0 to feature/10.0
...
* commit 'cfe3da4d9d5fbdf15ed2c27ee70c5c61df7c41b1':
无jira任务 docs: 补充readme
DEC-14578 feat: hibernate二级缓存卡顿
DEC-14578 feat: hibernate自动删除旧唯一键
DEC-14578 feat: 使hibernate支持主键的自动更新
DEC-14578 feat: 去掉无用的jetbrain.NotNull依赖, 拆分Utils方法
QFX-1737 fix:数据上传之后报错
DEC-14578 打包脚本
DEC-14578 引入com.alibaba:transmittable-thread-local
4 years ago
Niko
cfe3da4d9d
Pull request #2032 : 无jira任务 docs: 补充readme
...
Merge in CORE/base-third from ~NIKO/base-third:release/10.0 to release/10.0
* commit 'e6d160428f4e7513c0713f1373c7c8689952176b':
无jira任务 docs: 补充readme
4 years ago
charile_Lu
e6d160428f
Merge branch 'release/10.0' of ssh://code.fineres.com:7999/~niko/base-third into release/10.0
...
merge
4 years ago
charile_Lu
ce88ba1b9d
无jira任务 docs: 补充readme
4 years ago
Elijah
094dfd02a3
Pull request #2031 : DEC-17827 feat: 多租户合并
...
Merge in CORE/base-third from ~ELIJAH/base-third:release/10.0 to release/10.0
* commit '55d87f160e59415099bd554902329f0e71e76120':
DEC-14578 feat: hibernate二级缓存卡顿
DEC-14578 feat: hibernate自动删除旧唯一键
DEC-14578 feat: 使hibernate支持主键的自动更新
DEC-14578 feat: 去掉无用的jetbrain.NotNull依赖, 拆分Utils方法
QFX-1737 fix:数据上传之后报错
DEC-14578 打包脚本
DEC-14578 引入com.alibaba:transmittable-thread-local
4 years ago
Elijah
55d87f160e
Pull request #2 : DEC-17827 feat: 多租户合并
...
Merge in ~ELIJAH/base-third from ~ELIJAH/qfx-base-third:release/10.0 to release/10.0
* commit '5d3f6ae58f65e6a29944fbe63bfee3dd6e8ebb34':
DEC-14578 feat: hibernate二级缓存卡顿
DEC-14578 feat: hibernate自动删除旧唯一键
DEC-14578 feat: 使hibernate支持主键的自动更新
DEC-14578 feat: 去掉无用的jetbrain.NotNull依赖, 拆分Utils方法
QFX-1737 fix:数据上传之后报错
DEC-14578 打包脚本
DEC-14578 引入com.alibaba:transmittable-thread-local
4 years ago
superman
65d03d6933
Merge pull request #2028 in CORE/base-third from release/10.0 to feature/10.0
...
* commit '3d80e23c4dfd8d337c44ae4ab90a4fe73621cc2d':
DEC-17895 fix: import fileupload相关类包名错误
4 years ago
superman
3d80e23c4d
Merge pull request #2027 in CORE/base-third from bugfix/10.0 to release/10.0
...
* commit 'e98789bc2cdd42f65ffa629ac5e637a34e618262':
4 years ago
superman
e98789bc2c
Merge pull request #2026 in CORE/base-third from final/10.0 to bugfix/10.0
...
* commit 'c27331d68a0389247e2036cc28b3c228131d2485':
DEC-17895 fix: import fileupload相关类包名错误
4 years ago
superman
c27331d68a
Merge pull request #2024 in CORE/base-third from release/10.0 to final/10.0
...
* commit 'f71bc772a5b0c6202e9219cf9a3429c63c3ac75c':
DEC-17895 fix: import fileupload相关类包名错误
无JIRA任务 fix: 修改third打包脚本
DEC-17331 fix: 裁掉spring对jackson的部分支持
无JIRA任务 feat: CBB增加分支
REPORT-47068 【定时调度】定时调度数据有误,定时调度传参数是正常的,报表计算出问题了
DEC-17254 feat: 升级Spring至4.3.29
REPORT-47816 在某些字体、字号下,导出pdf文字会有一个黑边(REPORT-29126 改动导致)
4 years ago
Niko
f71bc772a5
Pull request #2017 : DEC-17895 fix: import fileupload相关类包名错误
...
Merge in CORE/base-third from ~NIKO/base-third:release/10.0 to release/10.0
* commit '2d458382b91a923853d1d5b49b9ca530ff908765':
DEC-17895 fix: import fileupload相关类包名错误
4 years ago
charile_Lu
2d458382b9
DEC-17895 fix: import fileupload相关类包名错误
4 years ago
Elijah
5d3f6ae58f
Merge branch 'qufenxi' into release/10.0
...
# Conflicts:
# build.third_step8-jdk11.gradle
# build.third_step8.gradle
# fine-transmittable-thread-local/pom.xml
4 years ago
superman
22cd2ebe37
Merge pull request #1980 in CORE/base-third from feature/10.0 to feature/x
...
* commit 'bcae5d54f8b72be50e5bf2ed0d7af47fbb328dda':
4 years ago
superman
bcae5d54f8
Merge pull request #1978 in CORE/base-third from release/10.0 to feature/10.0
...
* commit 'b08a2df7825b6c4a64b41757f8865c11dc21cb2d':
4 years ago
superman
b08a2df782
Merge pull request #1977 in CORE/base-third from bugfix/10.0 to release/10.0
...
* commit '19e8f8102d9e7df6477c753d3414983fb3270301':
4 years ago
superman
19e8f8102d
Merge pull request #1976 in CORE/base-third from final/10.0 to bugfix/10.0
...
* commit '2f0674ee4dd98ee22f92ee5808aa7105282c15eb':
4 years ago
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
superman
7fcd619f73
Merge pull request #1949 in CORE/base-third from feature/10.0 to feature/x
...
* commit '5ca461646bdd64b5c74ba81df6fccbfdc82df6c8':
REPORT-47068 【定时调度】定时调度数据有误,定时调度传参数是正常的,报表计算出问题了
DEC-17331 fix: 裁掉spring对jackson的部分支持
4 years ago
superman
5ca461646b
Merge pull request #1935 in CORE/base-third from release/10.0 to feature/10.0
...
* commit 'a45c9f56059dd341ebd976dece5cce611ee87d0b':
REPORT-47068 【定时调度】定时调度数据有误,定时调度传参数是正常的,报表计算出问题了
4 years ago
superman
a45c9f5605
Merge pull request #1934 in CORE/base-third from bugfix/10.0 to release/10.0
...
* commit '695ac2eefd4bc439b088230c698c3400bc35758b':
REPORT-47068 【定时调度】定时调度数据有误,定时调度传参数是正常的,报表计算出问题了
4 years ago
superman
695ac2eefd
Merge pull request #1933 in CORE/base-third from final/10.0 to bugfix/10.0
...
* commit '2698dbb22a393db4ef70066536b22f2a389ea20e':
REPORT-47068 【定时调度】定时调度数据有误,定时调度传参数是正常的,报表计算出问题了
4 years ago
superman
4c9d078746
Merge pull request #1931 in CORE/base-third from bugfix/10.0 to release/10.0
...
* commit '0da59dccccaa18ecbaee2e974b44ab5fbd962d1b':
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
2d1c8f476d
Merge pull request #1929 in CORE/base-third from bugfix/10.0 to feature/10.0
...
* commit '0da59dccccaa18ecbaee2e974b44ab5fbd962d1b':
DEC-17331 fix: 裁掉spring对jackson的部分支持
4 years ago
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
7d537be5f8
Merge pull request #1923 in CORE/base-third from feature/10.0 to feature/x
...
* commit 'd7f108a7f12afe060e85d16de9176fe8bfbb42ce':
无JIRA任务 feat: CBB增加分支
无JIRA任务 fix: 修改third打包脚本
无JIRA任务 fix: 修改third打包脚本
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
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
2c5fa8705a
Merge pull request #1917 in CORE/base-third from feature/10.0 to feature/x
...
* 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