Merge branch 'lal' into 'develop'

Lal

See merge request 8timerv2/8timerapiv200!277

src/main/java/cn/timer/api/bean/kqmk/KqglAssoRelationSummary.java

@@ -55,10 +55,10 @@ public class KqglAssoRelationSummary extends Model<KqglAssoRelationSummary> {
 	@ApiModelProperty(value = "假期类型id", example = "101")
 	private Integer leaveTypeId;
 
-	@ApiModelProperty(value = "加班类型id", example = "101")
+	@ApiModelProperty(value = "加班类型id 1：工作日加班；2：休息日加班；3：节假日加班", example = "101")
 	private Integer overtimeTypeId;
 
-	@ApiModelProperty(value = "加班补偿方式 1：转调休；2：转加班费；3：转调休或加班费", example = "101")
+	@ApiModelProperty(value = "加班补偿方式 1：转调休；2：转加班费；（3：转调休 4：加班费）", example = "101")
 	private Integer compensateId;
 
 	@ApiModelProperty(value = "开始时间 ", example = "开始时间")