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

4 years ago · 23e1eb13a1
parent 9cd011c6ca 23f24d297d
commit 23e1eb13a1
1 changed files with 1 additions and 2 deletions
--- a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysOrderNoRule.java
+++ b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysOrderNoRule.java
@ -59,8 +59,7 @@ public class SysOrderNoRule extends BaseBean {

    @Column(name = "SERIAL_NO_LENGTH")
    @ApiParam(value = "流水号长度",example = "-1")
-    @JsonSerialize(using = ToStringSerializer.class)
-    private Long serialNoLength;
+    private Integer serialNoLength;

    @Column(name = "IS_CYCLE")
    @ApiParam(value = "是否按日期循环", example = "1")