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

字体更换

See merge request !2305

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

@@ -242,7 +242,7 @@ public class ImageCombined {
         // 添加白色背景
         g.setColor(Color.WHITE);
         g.fillRect(0, finalHeight - WHITE_SPACE_HEIGHT, width, WHITE_SPACE_HEIGHT);
-        String font = "PingFang SC";
+        String font = ApolloUtils.combinedFonts();
         // 添加门店名称，距底部88px
         g.setColor(new Color(36, 40, 53));
         g.setFont(new Font(font, Font.PLAIN, 30));