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

5 years ago · 173e145c56
parent a1dd0fa36b 5f9d597943
commit 173e145c56
1 changed files with 3 additions and 3 deletions
--- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesBoardMafactAssessment.java
+++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesBoardMafactAssessment.java
@ -111,8 +111,8 @@ public class MesBoardMafactAssessment extends BaseBean implements Serializable {
    @ApiParam("NOV")
    private String nov;
-    @Column(name = "DEC")
+    @Column(name = "DECEMBER")
-    @ApiParam("DEC")
+    @ApiParam("DECEMBER")
-    private String dec;
+    private String december;
 }