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

5 years ago · 76725167f7
parent f591139bed f2177fdc1e
commit 76725167f7
1 changed files with 3 additions and 0 deletions
--- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/BypassModel.java
+++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/BypassModel.java
@ -35,4 +35,7 @@ public class BypassModel {
    @ApiParam("状态")
    private String status;

+    @ApiParam("颜色")
+    private String color;
+
 }