Merge branch 'dev_qr_code' of http://git.elinkit.com.cn:7070/r/epmet-cloud into develop

3 years ago · 98acaa661a
2 changed files with 1 additions and 0 deletions
--- a/epmet-module/gov-org/gov-org-server/Dockerfile
+++ b/epmet-module/gov-org/gov-org-server/Dockerfile
@ -5,6 +5,7 @@ RUN ln -sf /usr/share/zoneinfo/Asia/Shanghai /etc/localtime
 RUN echo 'Asia/Shanghai' > /etc/timezone

 COPY ./target/*.jar ./gov-org.jar
+COPY ./fonts/NotoSansSC-Light.otf /usr/share/fonts

 EXPOSE 8092

--- a/epmet-module/gov-org/gov-org-server/fonts/NotoSansSC-Light.otf
+++ b/epmet-module/gov-org/gov-org-server/fonts/NotoSansSC-Light.otf