Merge branch 'lcy' of http://47.107.53.207:3000/traineeCoder001/Digital-Investment

ruoyi-demo/src/main/java/com/ruoyi/demo/service/impl/GoodsServiceImpl.java

@@ -53,6 +53,16 @@ public class GoodsServiceImpl implements GoodsService {
     public PageInfo<List<GoodsListVo>> getGoodsList(PlanBo bo) {
         PageHelper.startPage(bo.getPageNum(),bo.getPageSize(),true);
         QueryWrapper<Goods> queryWrapper = new QueryWrapper<>();
+        if (bo.getText() != null)
+            queryWrapper.like("goods_id",bo.getText())
+                .or()
+                .like("goods_name",bo.getText())
+                .or()
+                .like("vendor_id",bo.getText())
+                .or()
+                .like("vendor_name",bo.getText())
+                .or()
+                .like("goods_classify",bo.getText());
         if (bo.getStartTime() != null)
             queryWrapper.apply("create_time >= STR_TO_DATE({0},'%Y-%m-%d %H:%i:%s')",bo.getStartTime());
         if (bo.getEndTime() != null)