Commit a12271e68eeebcb512228b947f29143bc853267c
1 parent
4dbd7974
解决合并冲突
Showing
1 changed file
with
1 additions
and
1 deletions
src/main/java/com/order/erp/common/constant/Constant.java
| @@ -161,7 +161,7 @@ public class Constant { | @@ -161,7 +161,7 @@ public class Constant { | ||
| 161 | 161 | ||
| 162 | public static final int SEVEN = 7; | 162 | public static final int SEVEN = 7; |
| 163 | public static final int FOURTEEN= 14; | 163 | public static final int FOURTEEN= 14; |
| 164 | - public static final int THIRTY = 30; | 164 | + public static final Integer THIRTY = 30; |
| 165 | public static final int SIXTY = 60; | 165 | public static final int SIXTY = 60; |
| 166 | public static final int TWENTY_FIRST = 21; | 166 | public static final int TWENTY_FIRST = 21; |
| 167 | 167 |