Merge remote-tracking branch 'origin/prod'

# Conflicts: # cash-api/product-server/src/main/java/com/czg/controller/user/UProductController.java
2025-04-07 17:26:21 +08:00
parent 91ec453948 3bcdb04f71
commit 22da0ae2d5
3 changed files with 3 additions and 23 deletions
--- a/cash-common/cash-common-service/src/main/java/com/czg/product/vo/ShopProductVo.java
+++ b/cash-common/cash-common-service/src/main/java/com/czg/product/vo/ShopProductVo.java
@@ -115,10 +115,4 @@ public class ShopProductVo implements Serializable {
     * 销量
     */
    private BigDecimal salesVolume;
-
-    @JSONField(serialize = false)
-    private ProdIsSaleTimeDTO prodIsSaleTimeDTO;
-
-    @JSONField(serialize = false)
-    private GroupIsSaleTimeDTO groupIsSaleTimeDTO;
 }