Merge remote-tracking branch 'origin/master'

src/main/java/com/yxt/goods/biz/goodstype/GoodsTypeService.java

@@ -89,7 +89,7 @@ public class GoodsTypeService extends MybatisBaseService<GoodsTypeMapper, GoodsT
             else if(record.getOutStockRule().equals("1")){
                 record.setOutStockRuleVaule("先进后出");
             }
-            else if(record.getOutStockRule().equals("2")){
+            else if(record.getOutStockRule().equals("3")){
                 record.setOutStockRuleVaule("保质期优先");
             }
         }
@@ -169,7 +169,7 @@ public class GoodsTypeService extends MybatisBaseService<GoodsTypeMapper, GoodsT
             else if(vo.getOutStockRule().equals("1")){
                 vo.setOutStockRuleVaule("先进后出");
             }
-            else if(vo.getOutStockRule().equals("2")){
+            else if(vo.getOutStockRule().equals("3")){
                 vo.setOutStockRuleVaule("保质期优先");
             }
         }