add sanlux project

modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/Resource.java

@@ -117,16 +117,6 @@ public class Resource extends BaseAPS {
     @FieldAnnotation(multiEnumClass = ApsEnumUtil.EFFICIENCY_EFFECT.class)
     private Integer timeTailRound;
 
-    @Column(name="LOCK_TYPE")
-    @ApiParam(value ="锁定类型")
-    @FieldAnnotation(defaultValue = "NONE")
-    private ApsEnumUtil.RESOURCE_LOCK_TYPE lockType;
-
-    @Column(name="LOCK_TIME")
-    @ApiParam(value ="锁定时间长度")
-    @FieldAnnotation(editType = ApsEnumUtil.EDIT_TYPE.DURATION)
-    private String lockTime;
-
     @ApiParam(value ="是否存在任务冲突")
     @FieldAnnotation(property = false)
     @Transient

modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/StandOperation.java

@@ -65,9 +65,4 @@ public class StandOperation extends BaseAPS {
     @ApiParam(value ="生产组合方式")
     @FieldAnnotation(defaultValue = "MAX_ALL_RESOURCE")
     private ApsEnumUtil.RES_COMB_TIME_TYPE combType;
-
-    @Column(name="LOCK_TYPE")
-    @ApiParam(value ="锁定组合方式")
-    @FieldAnnotation(defaultValue = "MAX_ALL_RESOURCE")
-    private ApsEnumUtil.RES_COMB_LOCK_TYPE lockType;
 }