Merge branch 'dev/dev' into dev/dev_xp
# Conflicts: # pom.xml
This commit is contained in:
@@ -2,10 +2,11 @@ package com.ai.da.mapper.primary.entity;
|
||||
|
||||
import lombok.Data;
|
||||
|
||||
import java.io.Serializable;
|
||||
import java.util.List;
|
||||
|
||||
@Data
|
||||
public class Gradient {
|
||||
public class Gradient implements Serializable {
|
||||
private List<GradientItem> gradientList;
|
||||
private int angle;
|
||||
private int selectIndex;
|
||||
|
||||
@@ -2,8 +2,10 @@ package com.ai.da.mapper.primary.entity;
|
||||
|
||||
import lombok.Data;
|
||||
|
||||
import java.io.Serializable;
|
||||
|
||||
@Data
|
||||
public class GradientItem {
|
||||
public class GradientItem implements Serializable {
|
||||
private RGBA rgba;
|
||||
private String left;
|
||||
}
|
||||
|
||||
@@ -2,8 +2,10 @@ package com.ai.da.mapper.primary.entity;
|
||||
|
||||
import lombok.Data;
|
||||
|
||||
import java.io.Serializable;
|
||||
|
||||
@Data
|
||||
public class RGBA {
|
||||
public class RGBA implements Serializable {
|
||||
private int r;
|
||||
private int g;
|
||||
private int b;
|
||||
|
||||
Reference in New Issue
Block a user