Merge branch 'feature-chat-activity' into 'developer'

字体更换

See merge request !2307

haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/context/combined/ImageCombined.java

@@ -242,6 +242,8 @@ public class ImageCombined {
         // 添加白色背景
         g.setColor(Color.WHITE);
         g.fillRect(0, finalHeight - WHITE_SPACE_HEIGHT, width, WHITE_SPACE_HEIGHT);
+        g.setRenderingHint(RenderingHints.KEY_ANTIALIASING, RenderingHints.VALUE_ANTIALIAS_ON);
+        g.setRenderingHint(RenderingHints.KEY_TEXT_ANTIALIASING, RenderingHints.VALUE_TEXT_ANTIALIAS_ON);
         String font = ApolloUtils.combinedFonts();
         int type = ApolloUtils.combinedFontsType();
         // 添加门店名称，距底部88px