Merge remote-tracking branch 'origin/dev' into zs

# Conflicts:
#	eladmin-system/src/main/java/cn/ysk/cashier/repository/order/TbOrderDetailRepository.java

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

@@ -35,6 +35,9 @@ public class ShopUserInfoVo implements Serializable {
     private long createAt;
     private long lastLoginAt;
 
+    private BigDecimal inMoney;
+    private Integer orderNumber;
+
     public Object getSex() {
         return sex;
     }