apsbackend.git - Gitblit

			@@ -38,6 +38,10 @@
			@Schema(description = "资源组", type = "String")
			@Excel(name = "资源组")
			private String resourceGroupName;
			/** 专业 */
			@Schema(description = "专业", type = "String")
			@Excel(name = "专业")
			private String major;

			/** 产能模型: 独占/合批 */
			@Schema(description = "产能模型", type = "String")
			@@ -55,8 +59,8 @@
			private String plantId;

			/** 工厂 */
			@Schema(description = "工厂", type = "String")
			@Excel(name = "工厂")
			@Schema(description = "适用工厂", type = "String")
			@Excel(name = "适用工厂")
			private String plant;

			/** 车间Id */
			@@ -65,8 +69,8 @@
			private String workShopId;

			/** 车间 */
			@Schema(description = "车间", type = "String")
			@Excel(name = "车间")
			@Schema(description = "适用车间", type = "String")
			@Excel(name = "适用车间")
			private String workShop;

			/** 日历Id */
			@@ -74,24 +78,22 @@
			// @Excel(name = "日历Id")
			private Long workCalenderId;

			/** 删除标志（0代表存在 2代表删除） */
			@Schema(description = "删除标志（0代表存在 2代表删除）", type = "String")
			private String delFlag;
			/** 日历描述 */
			@Schema(description = "日历描述", type = "String")
			@Excel(name = "日历描述")
			private String workCalender;

			/** 产能模型Id */
			@Schema(description = "产能模型Id", type = "Long")
			// @Excel(name = "产能模型Id")
			private Long modelId;

			/** 日历描述 */
			@Schema(description = "日历描述", type = "String")
			@Excel(name = "日历描述")
			private String workCalender;

			/** 专业 */
			@Schema(description = "专业", type = "String")
			@Excel(name = "专业")
			private String major;
			/** 删除标志（0代表存在 2代表删除） */
			@Schema(description = "删除标志（0代表存在 2代表删除）", type = "String")
			private String delFlag;



			public String getMajor() {
			return major;