Merge remote-tracking branch 'origin/master'

src/main/java/cn/ezhizao/project/business/product/controller/BizLotController.java

@@ -120,6 +120,7 @@ public class BizLotController extends BaseController {
                 //去掉备料的序
                 wrapper.ne("process_id",0);
                 wrapper.ne("process_id",1);
+                wrapper.eq("is_conceal", 0);
                 wrapper.orderByAsc("process_step_number");
                 List<BizLotTechnologicalProcessDetail> list = bizLotTechnologicalProcessDetailService.list(wrapper);
                 return success(list);
@@ -131,6 +132,7 @@ public class BizLotController extends BaseController {
                 wrapper.ne("process_id",0);
                 wrapper.ne("process_id",1);
                 wrapper.eq("tenant_id",bizLot.getTenantId());
+                wrapper.eq("is_conceal", 0);
                 wrapper.ne("tenant_id", 9);
                 wrapper.orderByAsc("process_step_number");
                 return success(bizTechnologicalProcessDetailService.list(wrapper));

src/main/java/cn/ezhizao/project/business/product/domain/BizLotTechnologicalProcessDetail.java

@@ -26,6 +26,9 @@ public class BizLotTechnologicalProcessDetail extends BaseEntity
     @ApiModelProperty(value = "${comment}")
     private Long lotTechnologicalProcessId;
 
+    //是否隐藏
+    private Integer isConceal;
+
     @ApiModelProperty(value = "批次")
     private Long lotId;