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

1

昨天 9126e6315288e1ea50e74c70b099974522d6b172

 src/main/java/com/zy/asrs/service/BasArmRulesService.java

@@ -12,4 +12,7 @@

    boolean updateStatus(Double materialLength,Double materialWidth,Double materialHeight,Double materialWeight,Double materialNumber,int status);
    boolean updateStatus(ArmPrecomputeParam.CombMat combMat);

    Integer getNumber(Double weight,Double volume,Double length,Double width,Double height);
    Integer getStatus(Double weight,Double volume,Double length,Double width,Double height);
}