refactor(MercProjectGoodsServiceImpl): 优化 commonQueryWrapper 方法

- 添加了对 actType、goodsIdList 和 actId 参数的查询条件
- 提高了查询的灵活性和准确性

src/main/java/com/xynet/marketing/service/impl/MercProjectGoodsServiceImpl.java

@@ -28,6 +28,9 @@ public class MercProjectGoodsServiceImpl extends ServiceImpl<MercProjectGoodsMap
     private LambdaQueryWrapper<MercProjectGoods> commonQueryWrapper(JMap<String,Object> param) {
         LambdaQueryWrapper<MercProjectGoods> lqw = new LambdaQueryWrapper<MercProjectGoods>()
                 .eq(Emptys.check(param.getInt("id")), MercProjectGoods::getId, param.getInt("id"))
+                .eq(Emptys.check(param.getString("actType")), MercProjectGoods::getActType, param.getString("actType"))
+                .in(Emptys.check(param.getList("goodsIdList")), MercProjectGoods::getGoodsId, param.getList("goodsIdList"))
+                .in(Emptys.check(param.getInt("actId")), MercProjectGoods::getActId, param.getInt("actId"))
                 .in(Emptys.check(param.getList("actIdList")), MercProjectGoods::getActId, param.getList("actIdList"))
                 ;
         return lqw;