Merge remote-tracking branch 'origin/master'

bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/order/domain/OrderInfo.java

@@ -284,6 +284,7 @@ public class OrderInfo extends BaseEntity
                 orderInfo.setDeviceOrderId(StringUtils.defaultString(orderInfoAddParam.getDeviceOrderId(), StringUtils.EMPTY));
                 orderInfo.setDeviceSn(StringUtils.defaultString(orderInfoAddParam.getDeviceSn(), StringUtils.EMPTY));
                 orderInfo.setDeviceNum(StringUtils.defaultString(orderInfoAddParam.getDeviceNum(), StringUtils.EMPTY));
+                orderInfo.setIdentityVerification(orderInfoAddParam.getIdentityVerification());
                 orderInfo.setUserId(param.getUserId());
                 orderInfo.setPayableAmount(param.getPayableAmount());
                 orderInfo.setRealAmount(param.getRealAmount());

bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/order/domain/param/DeviceOrderInfoAddParam.java

@@ -30,6 +30,8 @@ public class DeviceOrderInfoAddParam {
     private String deviceSn;
     @NotNull(message = "设备编号不能为空")
     private String deviceNum;
+    @NotNull(message = "核身方式不能为空")
+    private Integer identityVerification;
     @Valid
     private List<DeviceOrderDetailInfoAddParam> orderDetailList;
 }