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

modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/MesPpMaster.java

@@ -102,6 +102,21 @@ public class MesPpMaster extends BaseBean{
     @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.SELECT, dataSrc = "WORK_ORDER_PLAN_STATUS")
     private Integer workOrderPlanStatus;
 
+    @Column(name = "MODIFY_DATE_TIME_START")
+    @ApiParam("操作开始时间")
+    @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT, isRequire = 2)
+    private String modifyDateTimeStart;
+
+    @Column(name = "MODIFY_DATE_TIME_END")
+    @ApiParam("操作结束时间")
+    @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT, isRequire = 2)
+    private String modifyDateTimeEnd;
+
+    @Column(name = "TYPE")
+    @ApiParam("类型")
+    @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT, isRequire = 2)
+    private String type;
+
     @Transient
     @ApiParam("是否要从拉动计算中扣除")
     private boolean needMinutPullQty = false;