Merge remote-tracking branch 'origin/master'

xuhy

1 天以前 092a98a583c4fe822a3eb4c4dac086f84b16189c

 ruoyi-system/src/main/java/com/ruoyi/system/service/TErpGoodsService.java

@@ -44,7 +44,7 @@
     */
    List<TErpGoodsVO> listExport(TErpGoodsQuery query, SysUser user);

    boolean isExit(String goodsIdCode,String quasiNumber);
    boolean isExit(String goodsIdCode,String quasiNumber,String id);


    PageInfo<TErpGoodsInventoryVO> pageInventoryGoodsPageList(@Valid TErpGoodsInventoryQuery query, SysUser user);