Commit Graph

  • b53bfebbde Merge pull request #10469 in CORE/base-third from bugfix/10.0 to feature/10.0 superman 2024-03-13 13:32:07 +0800
  • 70d6dcece6 Merge pull request #10468 in CORE/base-third from release/10.0 to bugfix/10.0 superman 2024-03-13 13:31:08 +0800
  • 209c018d1a Merge pull request #10467 in CORE/base-third from final/10.0 to release/10.0 superman 2024-03-13 13:30:44 +0800
  • 48366ae4af Merge pull request #10464 in CORE/base-third from final/11.0 to persist/11.0 superman 2024-03-12 18:03:51 +0800
  • 5b8d873c23 Merge pull request #10463 in CORE/base-third from release/10.0 to final/10.0 superman 2024-03-12 17:08:02 +0800
  • cefb936529 Merge pull request #10462 in CORE/base-third from bugfix/10.0 to release/10.0 superman 2024-03-12 16:57:06 +0800
  • 475d270306 Merge pull request #10451 in CORE/base-third from bugfix/11.0 to feature/x superman 2024-03-11 15:55:36 +0800
  • 00e98f84d0 Merge pull request #10450 in CORE/base-third from release/11.0 to bugfix/11.0 superman 2024-03-11 15:53:31 +0800
  • c5f3c60d70 Merge pull request #10449 in CORE/base-third from final/11.0 to release/11.0 superman 2024-03-11 15:51:39 +0800
  • c9bd13d87b Merge pull request #10448 in CORE/base-third from persist/11.0 to final/11.0 superman 2024-03-11 15:50:48 +0800
  • 861ffe797d Merge pull request #10447 in CORE/base-third from persist/11.0 to persist/jsy11 superman 2024-03-11 15:49:28 +0800
  • 9308272b31 Merge pull request #10441 in CORE/base-third from bugfix/11.0 to feature/x superman 2024-03-11 14:48:48 +0800
  • 81e2c84143 Merge pull request #10440 in CORE/base-third from release/11.0 to bugfix/11.0 superman 2024-03-11 14:47:49 +0800
  • a1355f8fae Merge pull request #10438 in CORE/base-third from final/11.0 to release/11.0 superman 2024-03-11 11:21:03 +0800
  • 15a8848c81 Merge pull request #10439 in CORE/base-third from final/11.0 to persist/11.0 superman 2024-03-10 18:11:27 +0800
  • b605960719 Merge pull request #10437 in CORE/base-third from persist/11.0 to final/11.0 superman 2024-03-10 13:31:29 +0800
  • 42c09174c3 Merge pull request #10436 in CORE/base-third from persist/11.0 to persist/jsy11 superman 2024-03-10 13:30:46 +0800
  • ad8fd3994a Merge pull request #10435 in CORE/base-third from bugfix/10.0 to feature/10.0 superman 2024-03-10 13:30:23 +0800
  • 683d64d28b Merge pull request #10434 in CORE/base-third from release/10.0 to bugfix/10.0 superman 2024-03-10 13:30:16 +0800
  • 31e39070e6 Merge pull request #10430 in CORE/base-third from bugfix/11.0 to feature/x superman 2024-03-09 14:41:44 +0800
  • 1265af8054 Merge pull request #10429 in CORE/base-third from release/11.0 to bugfix/11.0 superman 2024-03-09 14:41:19 +0800
  • ba7d125b21 Merge pull request #10428 in CORE/base-third from final/11.0 to persist/11.0 superman 2024-03-08 15:53:30 +0800
  • faca6e0eb0 Pull request #10426: REPORT-113277 Hibernate组件修复CVE漏洞 lidongy-李东原 2024-03-07 15:55:00 +0800
  • 39f047d2ae Pull request #10427: REPORT-113277 Hibernate组件修复CVE漏洞 lidongy-李东原 2024-03-07 15:54:59 +0800
  • 73e22ef7fc REPORT-113277 Hibernate组件修复CVE漏洞 lidongy 2024-03-07 09:49:49 +0800
  • c7ba861e7f REPORT-113277 Hibernate组件修复CVE漏洞 lidongy 2024-03-07 09:49:21 +0800
  • 9590f67f3a Pull request #10425: REPORT-115463 springframework CVE-2024-22243 漏洞 lidongy-李东原 2024-03-06 09:38:30 +0800
  • 676a156dc8 REPORT-115463 springframework CVE-2024-22243 漏洞 lidongy 2024-03-05 17:42:49 +0800
  • 420c61b507 Merge pull request #10376 in CORE/base-third from bugfix/11.0 to feature/x superman 2024-02-29 13:34:43 +0800
  • 3263e16ea9 Merge pull request #10375 in CORE/base-third from release/11.0 to bugfix/11.0 superman 2024-02-29 13:33:11 +0800
  • 027fb83913 Merge pull request #10374 in CORE/base-third from final/11.0 to release/11.0 superman 2024-02-29 13:31:09 +0800
  • 2f3500a47e Merge pull request #10365 in CORE/base-third from release/11.0 to final/11.0 superman 2024-02-28 18:09:54 +0800
  • 7ebd617f1d Merge pull request #10355 in CORE/base-third from bugfix/11.0 to feature/x superman 2024-02-27 19:30:56 +0800
  • 0ea8be9c05 Merge pull request #10354 in CORE/base-third from release/11.0 to bugfix/11.0 superman 2024-02-27 19:29:09 +0800
  • 601ce2716a Merge pull request #10353 in CORE/base-third from final/11.0 to release/11.0 superman 2024-02-27 19:28:19 +0800
  • 5755bcc610 Merge pull request #10344 in CORE/base-third from persist/11.0 to final/11.0 superman 2024-02-27 18:00:04 +0800
  • 7e2436ef58 Merge pull request #10343 in CORE/base-third from persist/11.0 to persist/jsy11 superman 2024-02-27 17:59:17 +0800
  • 52b7406725 Merge pull request #10342 in CORE/base-third from bugfix/10.0 to feature/10.0 superman 2024-02-27 17:58:48 +0800
  • 3c7984f7c7 Merge pull request #10341 in CORE/base-third from release/10.0 to bugfix/10.0 superman 2024-02-27 17:57:40 +0800
  • 3c01e1fc46 Merge pull request #10340 in CORE/base-third from final/10.0 to release/10.0 superman 2024-02-27 17:56:58 +0800
  • e2c064abb6 Merge pull request #10336 in CORE/base-third from persist/10.0 to final/10.0 superman 2024-02-27 15:33:25 +0800
  • 596cfcd7e1 Merge pull request #10335 in CORE/base-third from persist/10.0 to persist/jsy superman 2024-02-27 15:32:29 +0800
  • ee7eb45c9b Merge pull request #10332 in CORE/base-third from bugfix/11.0 to release/11.0 superman 2024-01-30 20:09:32 +0800
  • b8f12a90fa Merge pull request #10331 in CORE/base-third from feature/x to bugfix/11.0 superman 2024-01-30 17:55:13 +0800
  • 9e677e6809 Merge pull request #10330 in CORE/base-third from final/11.0 to persist/11.0 v11.0.895 superman 2024-01-25 17:30:56 +0800
  • 23b53c2b5c Merge pull request #10329 in CORE/base-third from final/10.0 to persist/10.0 superman 2024-01-25 17:25:50 +0800
  • 17b1af3b18 Merge pull request #10302 in CORE/base-third from bugfix/11.0 to feature/x superman 2024-01-10 13:54:34 +0800
  • d2f5934ed5 Merge pull request #10301 in CORE/base-third from release/11.0 to bugfix/11.0 superman 2024-01-10 11:05:29 +0800
  • 1e0d48f962 Merge pull request #10300 in CORE/base-third from final/11.0 to release/11.0 superman 2024-01-10 11:04:26 +0800
  • 1756e8b466 Merge pull request #10299 in CORE/base-third from persist/11.0 to final/11.0 superman 2024-01-10 11:03:12 +0800
  • 8cbede567b Merge pull request #10298 in CORE/base-third from persist/11.0 to persist/jsy11 superman 2024-01-10 11:02:03 +0800
  • 3fdfc7db94 Merge pull request #10297 in CORE/base-third from bugfix/10.0 to feature/10.0 superman 2024-01-10 11:01:11 +0800
  • cb26bc3739 Merge pull request #10296 in CORE/base-third from release/10.0 to bugfix/10.0 superman 2024-01-10 11:00:41 +0800
  • a4aa1b5cdf Merge pull request #10295 in CORE/base-third from final/10.0 to release/10.0 superman 2024-01-10 10:59:34 +0800
  • 1714747f4b Merge pull request #10294 in CORE/base-third from persist/10.0 to final/10.0 superman 2024-01-10 10:58:44 +0800
  • ab8bbcf5a1 Merge pull request #10293 in CORE/base-third from persist/10.0 to persist/jsy superman 2024-01-10 10:58:10 +0800
  • 0761475eb6 Merge pull request #10292 in CORE/base-third from final/11.0 to persist/11.0 superman 2024-01-04 20:03:02 +0800
  • a762ba60e9 Merge pull request #10289 in CORE/base-third from final/10.0 to persist/10.0 superman 2024-01-04 14:39:38 +0800
  • bc20077d77 Merge pull request #10230 in CORE/base-third from bugfix/11.0 to feature/x superman 2023-12-29 13:35:21 +0800
  • 41ff01b07a Merge pull request #10229 in CORE/base-third from release/11.0 to bugfix/11.0 superman 2023-12-29 13:33:56 +0800
  • d11d92a8e4 Merge pull request #10225 in CORE/base-third from bugfix/10.0 to feature/10.0 superman 2023-12-29 13:32:41 +0800
  • 56cc8bed4e Merge pull request #10224 in CORE/base-third from release/10.0 to bugfix/10.0 superman 2023-12-29 13:31:25 +0800
  • d749bba73c Merge pull request #10223 in CORE/base-third from final/10.0 to release/10.0 superman 2023-12-29 13:30:56 +0800
  • c632160193 Merge pull request #10220 in CORE/base-third from release/10.0 to final/10.0 superman 2023-12-28 20:09:36 +0800
  • eb33e54b23 Merge pull request #10219 in CORE/base-third from bugfix/10.0 to release/10.0 superman 2023-12-28 20:05:20 +0800
  • 51fdaa9490 Merge pull request #10218 in CORE/base-third from final/11.0 to release/11.0 superman 2023-12-28 13:32:54 +0800
  • abc5e79826 Merge pull request #10210 in CORE/base-third from release/11.0 to final/11.0 superman 2023-12-27 21:46:30 +0800
  • cd672c296f Merge pull request #10159 in CORE/base-third from bugfix/11.0 to feature/x superman 2023-12-19 19:59:13 +0800
  • 126844b750 Merge pull request #10158 in CORE/base-third from release/11.0 to bugfix/11.0 superman 2023-12-19 19:57:55 +0800
  • d2e8cd65ba Merge pull request #10157 in CORE/base-third from bugfix/11.0 to release/11.0 superman 2023-12-19 09:06:51 +0800
  • 351590b529 Merge pull request #10156 in CORE/base-third from feature/x to bugfix/11.0 superman 2023-12-19 09:03:16 +0800
  • 50cf9eef08 Merge pull request #10117 in CORE/base-third from bugfix/11.0 to feature/x superman 2023-12-12 18:03:14 +0800
  • d793edebc2 Merge pull request #10116 in CORE/base-third from release/11.0 to bugfix/11.0 superman 2023-12-09 13:37:47 +0800
  • 3a69fd8c9f Merge pull request #10115 in CORE/base-third from final/11.0 to release/11.0 superman 2023-12-09 13:36:45 +0800
  • e7aa518848 Merge pull request #10114 in CORE/base-third from persist/11.0 to final/11.0 superman 2023-12-09 13:35:11 +0800
  • 41e5fcd343 Merge pull request #10113 in CORE/base-third from persist/11.0 to persist/jsy11 superman 2023-12-09 13:34:24 +0800
  • 7836daa23c Merge pull request #10112 in CORE/base-third from bugfix/10.0 to feature/10.0 superman 2023-12-09 13:33:51 +0800
  • a70b260c12 Merge pull request #10111 in CORE/base-third from release/10.0 to bugfix/10.0 superman 2023-12-09 13:32:37 +0800
  • ce1f175c1a Merge pull request #10110 in CORE/base-third from final/10.0 to release/10.0 superman 2023-12-09 13:32:00 +0800
  • c5876fead8 Merge pull request #10109 in CORE/base-third from persist/10.0 to final/10.0 superman 2023-12-09 13:30:48 +0800
  • e45e4c9b7b Merge pull request #10108 in CORE/base-third from persist/10.0 to persist/jsy superman 2023-12-09 13:30:16 +0800
  • bf643b9759 Merge pull request #10105 in CORE/base-third from bugfix/11.0 to feature/x superman 2023-12-08 15:19:32 +0800
  • 8a6ca6cd40 Merge pull request #10107 in CORE/base-third from final/11.0 to persist/11.0 superman 2023-12-07 15:30:39 +0800
  • f6a9af2918 Merge pull request #10106 in CORE/base-third from final/10.0 to persist/10.0 superman 2023-12-06 15:27:42 +0800
  • 9697184716 Merge pull request #10104 in CORE/base-third from release/11.0 to bugfix/11.0 superman 2023-12-06 13:30:41 +0800
  • a58b6110d6 Merge pull request #10103 in CORE/base-third from final/11.0 to release/11.0 superman 2023-12-06 13:30:27 +0800
  • 41815942d6 Pull request #10085: REPORT-108658 预览与导出pdf字体颜色不一致 Leo.Qin-覃宇攀 2023-12-05 17:18:48 +0800
  • 9620fc93b3 REPORT-108658 预览与导出pdf字体颜色不一致 【问题原因】字体填充颜色其实是一样的,但导出pdf后,字体存在黑色描边。 导出pdf时,若字体为粗体,会对字体进行描边。描边的颜色会使用到realPaint的颜色。在创建Graphics的时候,没有对realPaint进行初始化,正常情况下,是使用setPaint对其进行赋值。若此后再进行绘制,且没有调用setPaint方法,realPaint则为null,当字体为粗体时,会使用之前的颜色对其进行描边,字体颜色看起来会显示异常。 【改动思路】创建时,使用当前的realPaint进行初始化。 Leo.Qin 2023-12-04 18:49:24 +0800
  • 046647e576 Pull request #10083: 无JIRA任务 Persist/11.0合Research/11.0 rinoux-杨锐 2023-12-01 15:17:26 +0800
  • d9ca634bc0 Merge branch 'persist/11.0' of ssh://code.fineres.com:7999/~rinoux/base-third into research/11.0 rinoux 2023-12-01 15:15:57 +0800
  • 89baafafca Merge pull request #10077 in CORE/base-third from bugfix/10.0 to feature/10.0 superman 2023-12-01 13:32:20 +0800
  • d4128f6991 Merge pull request #10076 in CORE/base-third from release/10.0 to bugfix/10.0 superman 2023-12-01 13:31:06 +0800
  • 445c38cf9a Merge pull request #10075 in CORE/base-third from final/10.0 to release/10.0 superman 2023-12-01 13:30:38 +0800
  • 56895fba09 Merge pull request #10071 in CORE/base-third from release/10.0 to final/10.0 superman 2023-11-30 19:55:44 +0800
  • 6897f1999e Merge pull request #10070 in CORE/base-third from bugfix/10.0 to release/10.0 superman 2023-11-30 19:52:28 +0800
  • 56a59a670e Merge pull request #10059 in CORE/base-third from bugfix/11.0 to feature/x superman 2023-11-29 13:33:42 +0800
  • 8d2fc767f2 Merge pull request #10058 in CORE/base-third from release/11.0 to bugfix/11.0 superman 2023-11-29 13:31:57 +0800
  • 3624f5a33b Merge pull request #10057 in CORE/base-third from final/11.0 to release/11.0 superman 2023-11-29 13:31:01 +0800
  • 04fa2327eb Merge pull request #10054 in CORE/base-third from bugfix/10.0 to feature/10.0 superman 2023-11-29 13:30:17 +0800
  • 3a3dc27c33 Merge pull request #10053 in CORE/base-third from release/10.0 to bugfix/10.0 superman 2023-11-29 13:30:12 +0800