Merge branch 'api' into hive2.0

jyy

2021-03-09 708fd530fe4c1565ca2f20707a911b03e59c925f

 zq-erp/src/main/java/com/matrix/system/shopXcx/dao/ShopCouponDao.java

@@ -45,7 +45,7 @@
                              @Param("productId") Integer productId, @Param("attrIds") List<String> attrIds);

   List<ShopCoupon> selectCouponListByTag(@Param("isNewPeople") boolean isNewPeople, @Param("userId") String userId,
                                 @Param("tag") String tag,@Param("shopId") Long shopId);
                                 @Param("tag") String tag,@Param("companyId") Long companyId);

   public int updateStateByStateAndIds(@Param("list") List<String> list, @Param("state") int state);