angelo
/
java-base-app
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Compare commits

base: angelo:20f647105d9ece8ec6cd9985afb2dc5c2d0b1deb
Branches Tags
angelo:master
angelo:lx_test
angelo:lx_dev
angelo:bd_dev
angelo:bd_test
angelo:sangelxiu1/fipay
angelo:lx_dev_251104
angelo:bd_online
angelo:lx-dp_online
angelo:lx_online
angelo:lx-mh_online
angelo:bd_dev_image
angelo:bd_dev_20250910
..
compare: angelo:26053da65e5195d92cde33b0eec44d2d499c4602
Branches Tags
angelo:lx_test
angelo:lx_dev
angelo:bd_dev
angelo:bd_test
angelo:sangelxiu1/fipay
angelo:lx_dev_251104
angelo:bd_online
angelo:lx-dp_online
angelo:lx_online
angelo:lx-mh_online
angelo:bd_dev_image
angelo:bd_dev_20250910
angelo:master

No commits in common. "20f647105d9ece8ec6cd9985afb2dc5c2d0b1deb" and "26053da65e5195d92cde33b0eec44d2d499c4602" have entirely different histories.
20f647105d ... 26053da65e

2 changed files with 0 additions and 9 deletions
Show Stats Expand all files Collapse all files

2
bd-business/bd-business-sale/src/main/java/com/hzs/sale/order/controller/manager/SaOrderController.java
View File

@ -301,8 +301,6 @@ public class SaOrderController extends ParentOrderController {
if (StringUtils.isNotBlank(waresOrderVo.getOperateScope())) { if (StringUtils.isNotBlank(waresOrderVo.getOperateScope())) {
waresOrderVo.setOperateScope(ESupplyWay.getLabelByVal(Integer.parseInt(waresOrderVo.getOperateScope()))); waresOrderVo.setOperateScope(ESupplyWay.getLabelByVal(Integer.parseInt(waresOrderVo.getOperateScope())));
} }
// 商品类型
waresOrderVo.setIsMakerGiftVal(EWaresType.getLabelByValue(waresOrderVo.getIsMakerGift()));
// 发货类型 // 发货类型
waresOrderVo.setShippingChannelStr(EShippingChannel.getLabelByValue(waresOrderVo.getShippingChannel())); waresOrderVo.setShippingChannelStr(EShippingChannel.getLabelByValue(waresOrderVo.getShippingChannel()));
} }

7
bd-business/bd-business-sale/src/main/java/com/hzs/sale/order/vo/WaresOrderInfoVo.java
View File

@ -292,13 +292,6 @@ public class WaresOrderInfoVo implements Serializable {
*/ */
private Integer systemType; private Integer systemType;
/**
* 商品类型
*/
private Integer isMakerGift;
@Excel(name = "商品类型")
private String isMakerGiftVal;
/** /**
* 创建时间 * 创建时间
*/ */