Merge remote-tracking branch 'remotes/origin/dev' into test

5 years ago · 8e3c1b750a
parent dfb23bab1d 35fd2f7952
commit 8e3c1b750a
1 changed files with 2 additions and 0 deletions
--- a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysLocaleResource.java
+++ b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysLocaleResource.java
@ -49,6 +49,7 @@ public class SysLocaleResource  extends BaseBean {

    @Column(name="language_code")
    @ApiParam(value = "语言编码",example = "浏览器语言编码")
+    @AnnoOutputColumn
    private String languageCode;

    @Column(name="language_name_rdd")
@ -57,6 +58,7 @@ public class SysLocaleResource  extends BaseBean {

    @Column(name="resource_key")
    @ApiParam(value = "资源KEY",example = "格式A.B，全部大写，参考命名规范开发文档")
+    @AnnoOutputColumn
    private String resourceKey;

    @Lob