Merge remote-tracking branch 'origin/dev' into dev

rs-datacenter/rs-datacenter-api/src/main/java/com/upyuns/platform/rs/datacenter/entity/RscpImagePrice.java

@@ -23,7 +23,7 @@ public class RscpImagePrice implements java.io.Serializable {
     @KeySql(useGeneratedKeys = true)
     @Column(name = "id",insertable = false)
     @ApiModelProperty(value = "标识")
-    private String id;
+    private Integer id;
 
     /** 卫星 */
     @ApiModelProperty(value = "卫星")
@@ -114,7 +114,7 @@ public class RscpImagePrice implements java.io.Serializable {
      * 
      * @return 标识
      */
-    public String getId() {
+    public Integer getId() {
         return this.id;
     }
 
@@ -124,7 +124,7 @@ public class RscpImagePrice implements java.io.Serializable {
      * @param id
      *          标识
      */
-    public void setId(String id) {
+    public void setId(Integer id) {
         this.id = id;
     }
 

rs-datacenter/rs-datacenter-api/src/main/java/com/upyuns/platform/rs/datacenter/entity/RscpResolution.java

@@ -21,7 +21,7 @@ public class RscpResolution implements java.io.Serializable {
     @KeySql(useGeneratedKeys = true)
     @Column(name = "id",insertable = false)
     @ApiModelProperty(value = "")
-    private String id;
+    private Integer id;
 
     /** resolutionName */
     @ApiModelProperty(value = "分辨率标识")