Merge remote-tracking branch 'origin/test' into test

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

@@ -152,6 +152,8 @@ public class ShopUser implements Serializable {
     private LocalDateTime nextDeliverTime;
     // 是否分销员
     private String distributionShops;
+    private String memberCircleName;
+    private Integer memberCircleReward;
 
     @Column(ignore = true)
     private String memberName;

cash-common/cash-common-service/src/main/java/com/czg/market/vo/MemberDetailVO.java

@@ -34,4 +34,6 @@ public class MemberDetailVO implements Serializable {
     private LocalDateTime endTime;
 
     private String memberName;
+    private String memberCircleName;
+    private Integer memberCircleReward;
 }