Merge remote-tracking branch 'origin/dev_v3.2.1' into dev_v3.2.1

distributed-print-business/src/main/java/com/qmth/distributed/print/business/bean/marking/PictureConfig.java

@@ -12,16 +12,16 @@ public class PictureConfig {
     private Integer i;
 
     @ApiModelProperty(value = "左上角X坐标")
-    private Integer x;
+    private Double x;
 
     @ApiModelProperty(value = "左上角y坐标")
-    private Integer y;
+    private Double y;
 
     @ApiModelProperty(value = "裁切区宽度")
-    private Integer w;
+    private Double w;
 
     @ApiModelProperty(value = "裁切区高度")
-    private Integer h;
+    private Double h;
 
     public Integer getI() {
         return i;
@@ -31,35 +31,35 @@ public class PictureConfig {
         this.i = i;
     }
 
-    public Integer getX() {
+    public Double getX() {
         return x;
     }
 
-    public void setX(Integer x) {
+    public void setX(Double x) {
         this.x = x;
     }
 
-    public Integer getY() {
+    public Double getY() {
         return y;
     }
 
-    public void setY(Integer y) {
+    public void setY(Double y) {
         this.y = y;
     }
 
-    public Integer getW() {
+    public Double getW() {
         return w;
     }
 
-    public void setW(Integer w) {
+    public void setW(Double w) {
         this.w = w;
     }
 
-    public Integer getH() {
+    public Double getH() {
         return h;
     }
 
-    public void setH(Integer h) {
+    public void setH(Double h) {
         this.h = h;
     }
 }

teachcloud-common/src/main/java/com/qmth/teachcloud/common/bean/dto/stmms/PicConfig.java

@@ -4,13 +4,13 @@ public class PicConfig {
     //i图片序号
     private Integer i;
     //x左上角X坐标
-    private Integer x;
+    private Double x;
     //x左上角y坐标
-    private Integer y;
+    private Double y;
     //w裁切区宽度
-    private Integer w;
+    private Double w;
     //h裁切区高度
-    private Integer h;
+    private Double h;
 
     public Integer getI() {
         return i;
@@ -20,35 +20,35 @@ public class PicConfig {
         this.i = i;
     }
 
-    public Integer getX() {
+    public Double getX() {
         return x;
     }
 
-    public void setX(Integer x) {
+    public void setX(Double x) {
         this.x = x;
     }
 
-    public Integer getY() {
+    public Double getY() {
         return y;
     }
 
-    public void setY(Integer y) {
+    public void setY(Double y) {
         this.y = y;
     }
 
-    public Integer getW() {
+    public Double getW() {
         return w;
     }
 
-    public void setW(Integer w) {
+    public void setW(Double w) {
         this.w = w;
     }
 
-    public Integer getH() {
+    public Double getH() {
         return h;
     }
 
-    public void setH(Integer h) {
+    public void setH(Double h) {
         this.h = h;
     }
 }