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

eladmin-system/src/main/java/cn/ysk/cashier/vo/ShopUserInfoVo.java

@@ -23,6 +23,7 @@ import java.math.BigDecimal;
 @Data
 public class ShopUserInfoVo implements Serializable {
     private Integer id;
+    private Integer userId;
     private String headImg;
     private String nickName;
     private Object sex;