superman
87e983007d
Merge pull request #2140 in CORE/base-third from bugfix/10.0 to release/10.0
...
* commit '40b90b10c61147fb9893827cc036eafecc751f37':
4 years ago
superman
40b90b10c6
Merge pull request #2139 in CORE/base-third from final/10.0 to bugfix/10.0
...
* commit 'dcb669bbcf7698ee05fac14db92776a0616aff1f':
4 years ago
superman
dcb669bbcf
Merge pull request #2137 in CORE/base-third from bugfix/10.0 to final/10.0
...
* commit '571e4b34eb895053c88168beb13c59e14160d798':
4 years ago
superman
9ddf66bb89
Merge pull request #2087 in CORE/base-third from feature/10.0 to research/10.0
...
* commit 'e2f77156996671e3bf1fe8e51603d9d9fd248391':
4 years ago
superman
e2f7715699
Merge pull request #2086 in CORE/base-third from release/10.0 to feature/10.0
...
* commit '92f991c3737bb3f2f518ebc763296df95315abac':
4 years ago
superman
92f991c373
Merge pull request #2085 in CORE/base-third from bugfix/10.0 to release/10.0
...
* commit '571e4b34eb895053c88168beb13c59e14160d798':
4 years ago
superman
571e4b34eb
Merge pull request #2084 in CORE/base-third from final/10.0 to bugfix/10.0
...
* commit '97b75d96cf75dbab4cbcb5f5654d1453935f9d35':
4 years ago
superman
97b75d96cf
Merge pull request #2083 in CORE/base-third from persist/10.0 to final/10.0
...
* commit '70e7fe482cc1edb6321d974cd4830967e75ffa2f':
4 years ago
superman
70e7fe482c
Merge pull request #2082 in CORE/base-third from final/10.0 to persist/10.0
...
* commit '8c36fafd50b942631c86ba8ef95d3a7812c7bb5a':
4 years ago
superman
8c36fafd50
Merge pull request #2080 in CORE/base-third from persist/10.0 to final/10.0
...
* commit 'a19193984580a68ae471f929e8f402e9039d1b7a':
4 years ago
superman
a191939845
Merge pull request #2078 in CORE/base-third from final/10.0 to persist/10.0
...
* commit 'c1e2d99293dd2af388be7288980201d6dc1f9b30':
4 years ago
superman
7e74dd471e
Merge pull request #2070 in CORE/base-third from feature/10.0 to research/10.0
...
* commit '22c46929e09deb8f12de0bccea40ad407ccb6275':
REPORT-50649 导出-生僻字导出问题 Excel导出
4 years ago
superman
22c46929e0
Merge pull request #2069 in CORE/base-third from release/10.0 to feature/10.0
...
* commit 'a5aee3a7d9d415c420cf7c1bbfafc1a05e6f2453':
REPORT-50649 导出-生僻字导出问题 Excel导出
4 years ago
Bruce.Deng
a5aee3a7d9
Pull request #2052 : REPORT-50649 导出-生僻字导出问题 Excel导出 - by Joe.Jiang
...
Merge in CORE/base-third from ~BRUCE.DENG/base-third:release/10.0 to release/10.0
* commit 'f5c89564c91b874d9a37ab875ab4947c8e882144':
REPORT-50649 导出-生僻字导出问题 Excel导出
4 years ago
superman
899f024c1d
Merge pull request #2058 in CORE/base-third from feature/10.0 to research/10.0
...
* commit '3333248afd58f34163c8afb477782e3ee4db3265':
4 years ago
superman
3333248afd
Merge pull request #2057 in CORE/base-third from release/10.0 to feature/10.0
...
* commit 'acf1d7c868dbf1e5e19302b277a699a66b2b9aba':
4 years ago
superman
acf1d7c868
Merge pull request #2056 in CORE/base-third from bugfix/10.0 to release/10.0
...
* commit '4f0110f57d0f8c27b49158001461eb7b5827cc9b':
4 years ago
superman
4f0110f57d
Merge pull request #2055 in CORE/base-third from final/10.0 to bugfix/10.0
...
* commit 'c1e2d99293dd2af388be7288980201d6dc1f9b30':
4 years ago
superman
c1e2d99293
Merge pull request #2054 in CORE/base-third from persist/10.0 to final/10.0
...
* commit '7bc4f700b3cfc4fa1e73af429672284782b9dfc7':
4 years ago
superman
7bc4f700b3
Merge pull request #2053 in CORE/base-third from final/10.0 to persist/10.0
...
* commit 'c27331d68a0389247e2036cc28b3c228131d2485':
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
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
Cloud.Liu
45a731511b
Pull request #2051 : 无JIRA任务 chore: 同步fine-third的feature/10.0到research/10.0
...
Merge in CORE/base-third from ~CLOUD.LIU/base-third:research/10.0 to research/10.0
* commit '1db2fd489450dbafae7f9007a353d46a806cf48f':
无JIRA任务 chore: 同步fine-third的feature/10.0到research/10.0
4 years ago
Cloud.Liu
1db2fd4894
无JIRA任务 chore: 同步fine-third的feature/10.0到research/10.0
4 years ago
superman
3393b5e1db
Merge pull request #2037 in CORE/base-third from feature/10.0 to research/10.0
...
* commit '55f472d00e09b1ab8581db6e52ca934c0d7414d5':
无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
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
335ecf993a
Merge pull request #2029 in CORE/base-third from feature/10.0 to research/10.0
...
* commit '65d03d6933d84292e216175de88f9f4116771daf':
DEC-17895 fix: import fileupload相关类包名错误
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
bbdaad7226
Merge pull request #1979 in CORE/base-third from feature/10.0 to research/10.0
...
* 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
c79ea985a4
Merge pull request #1936 in CORE/base-third from feature/10.0 to research/10.0
...
* 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