wms / wms_tianjinggelinmei · Commits

Commit e2fc43d7d2de75764d99b56b04855970e94eb9b0

Authored by mahuandong
2 parents 9fc31968 927269fc

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

# Conflicts:
#	.idea/workspace.xml
Inline Side-by-side
Showing 2 changed files with 4 additions and 2 deletions
src/main/java/com/huaheng/pc/monitor/logExecption/domain/LogExecption.java
  View file @e2fc43d
... ... @@ -9,10 +9,12 @@ import io.swagger.annotations.ApiModelProperty;
9 9 import java.io.Serializable;
10 10 import java.util.Date;
11 11 import lombok.Data;
  12 +import lombok.EqualsAndHashCode;
12 13  
13 14 @ApiModel(value="com.huaheng.pc.monitor.logExecption.domain.LogExecption")
14 15 @Data
15 16 @TableName(value = "log_execption")
  17 +@EqualsAndHashCode(callSuper = false)
16 18 public class LogExecption extends RuntimeException implements Serializable {
17 19 /**
18 20 * 主键，自增字段
... ...
src/main/java/com/huaheng/pc/shipment/shippingCombination/service/ShippingCombinationService.java
  View file @e2fc43d
... ... @@ -18,8 +18,8 @@ public class ShippingCombinationService {
18 18  
19 19  
20 20 public List<InventoryDetail> getInventorys(ShippingSearch search) {
21   - List<InventoryDetail> list = shippingCombinationMapper.getInventorys(search);
22   - return list;
  21 + // List<InventoryDetail> list = shippingCombinationMapper.getInventorys(search);
  22 + return null;
23 23 }
24 24  
25 25 }
... ...