Merge remote-tracking branch 'origin/master'

cash-common/cash-common-service/src/main/java/com/czg/account/dto/shopuser/ShopUserDTO.java

@@ -4,11 +4,24 @@ import com.czg.account.entity.ShopUser;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 
+import java.math.BigDecimal;
+
 /**
  * @author Administrator
  */
 @EqualsAndHashCode(callSuper = true)
 @Data
 public class ShopUserDTO extends ShopUser {
+    /**
+     * 优惠券数量
+     */
     private Long couponNum;
+    /**
+     * 订单数量
+     */
+    private Long orderNumber;
+    /**
+     * 充值金额
+     */
+    private BigDecimal rechargeAmount;
 }

cash-common/cash-common-service/src/main/java/com/czg/account/entity/FreeDineConfig.java

@@ -30,9 +30,6 @@ public class FreeDineConfig implements Serializable {
     @Serial
     private static final long serialVersionUID = 1L;
 
-    @Id(keyType = KeyType.Auto)
-    private Long id;
-
     /**
      * 是否启用
      */
@@ -71,6 +68,7 @@ public class FreeDineConfig implements Serializable {
     /**
      * 门店id
      */
+    @Id
     private Long shopId;
 
     /**

cash-common/cash-common-service/src/main/java/com/czg/account/service/SysUserService.java

@@ -25,7 +25,7 @@ public interface SysUserService extends IService<SysUser> {
 
     Boolean removeUserAndRole(Long id);
 
-    Page<SysUser> getPage(String key, String startTime, String endTime, Integer status);
+    Page<SysUserDetailVO> getPage(String key, String startTime, String endTime, Integer status);
 
     Boolean edit(SysUserEditDTO sysUserEditDTO);