Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev

modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonManageQueue.java

@@ -338,9 +338,10 @@ public class AndonManageQueue extends BaseManageQueue {
      * @param confirmTime
      * @param resetTime
      */
-    public AndonManageQueue(String organizeCode,String workCenterNameRdd,String workCellNameRdd,String resetUser,String alarmCode,String callTime, String confirmTime,String resetTime){
+    public AndonManageQueue(String organizeCode,String workCenterNameRdd,String workCellCode,String workCellNameRdd,String resetUser,String alarmCode,String callTime, String confirmTime,String resetTime){
         this.organizeCode = organizeCode;
         this.workCenterNameRdd = workCenterNameRdd;
+        this.workCellCode = workCellCode;
         this.workCellNameRdd = workCellNameRdd;
         this.resetUser = resetUser;
         this.alarmCode = alarmCode;

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