Merge remote-tracking branch 'origin/main'
This commit is contained in:
commit
46f9d296cb
@ -139,10 +139,10 @@ public class TemplatePersonServiceImpl extends DefaultBaseService implements ITe
|
|||||||
createImageBean.setType("2");
|
createImageBean.setType("2");
|
||||||
}
|
}
|
||||||
createImageBean.setContent(contentData);
|
createImageBean.setContent(contentData);
|
||||||
createImageBean.setHeight(Integer.valueOf(obj.getString("templateAreaHeight")));
|
createImageBean.setHeight(Double.valueOf(obj.getString("templateAreaHeight")).intValue());
|
||||||
createImageBean.setWidth(Integer.valueOf(obj.getString("templateAreaWidth")));
|
createImageBean.setWidth(Double.valueOf(obj.getString("templateAreaWidth")).intValue());
|
||||||
createImageBean.setX(Integer.valueOf(obj.getString("templateAreaLeft")));
|
createImageBean.setX(Double.valueOf(obj.getString("templateAreaLeft")).intValue());
|
||||||
createImageBean.setY(Integer.valueOf(obj.getString("templateAreaTop")));
|
createImageBean.setY(Double.valueOf(obj.getString("templateAreaTop")).intValue());
|
||||||
list.add(createImageBean);
|
list.add(createImageBean);
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -303,10 +303,10 @@ public class TemplatePersonServiceImpl extends DefaultBaseService implements ITe
|
|||||||
createImageBean.setType("2");
|
createImageBean.setType("2");
|
||||||
}
|
}
|
||||||
createImageBean.setContent(contentData);
|
createImageBean.setContent(contentData);
|
||||||
createImageBean.setHeight(Integer.valueOf(obj.getString("templateAreaHeight")));
|
createImageBean.setHeight(Double.valueOf(obj.getString("templateAreaHeight")).intValue());
|
||||||
createImageBean.setWidth(Integer.valueOf(obj.getString("templateAreaWidth")));
|
createImageBean.setWidth(Double.valueOf(obj.getString("templateAreaWidth")).intValue());
|
||||||
createImageBean.setX(Integer.valueOf(obj.getString("templateAreaLeft")));
|
createImageBean.setX(Double.valueOf(obj.getString("templateAreaLeft")).intValue());
|
||||||
createImageBean.setY(Integer.valueOf(obj.getString("templateAreaTop")));
|
createImageBean.setY(Double.valueOf(obj.getString("templateAreaTop")).intValue());
|
||||||
list.add(createImageBean);
|
list.add(createImageBean);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user