商户端和管理台联调bug

jiangqs

2023-06-26 b4882b114f082e010d4cc3359d78d18095ef3b83

 ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/domain/pojo/ShopTotal.java

@@ -31,7 +31,7 @@
     * 商户id
     */
    @TableId("shop_id")
    private Integer shopId;
    private Long shopId;
    /**
     * 删除标记
     */
@@ -46,12 +46,12 @@
     * 总活动次数
     */
    @TableField("total_activity_count")
    private String totalActivityCount;
    private Integer totalActivityCount;
    /**
     * 总订单数
     */
    @TableField("total_order")
    private String totalOrder;
    private Integer totalOrder;
    /**
     * 总周期订单数
     */