Commit 3d455b6acfa877ac06875bdb1707ef7f58a8e4ba

Authored by 房远帅
1 parent 00afd91a

代码冲突

... ... @@ -128,10 +128,6 @@ public class GetReplenishmentOrderBo extends BaseBo<ReplenishmentOrder> {
128 128 */
129 129 @ApiModelProperty("状态名称")
130 130 private String statusName;
131   -
132   - @ApiModelProperty("是否展示审核按钮")
133   - private Boolean showExamine;
134   -
135 131 /**
136 132 * 是否展示审核按钮(非持久化字段)
137 133 */
... ...