Merge branch 'feature' of https://gitee.com/liuyingfang/cashier-admin into feature

# Conflicts:
#	eladmin-common/src/main/java/cn/ysk/cashier/config/RedisConfig.java
#	eladmin-system/src/main/java/cn/ysk/cashier/controller/order/TbOrderInfoController.java
#	eladmin-system/src/main/java/cn/ysk/cashier/dto/order/TbOrderInfoDto.java

eladmin-system/src/main/java/cn/ysk/cashier/dto/order/TbOrderInfoDto.java

@@ -16,6 +16,7 @@
 package cn.ysk.cashier.dto.order;
 
 import cn.ysk.cashier.pojo.order.TbOrderDetail;
+import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
 import java.math.BigDecimal;
@@ -34,6 +35,7 @@ public class TbOrderInfoDto implements Serializable {
     private Integer id;
 
     /** 订单编号 */
+    @ApiModelProperty(value = "订单编号")
     private String orderNo;
 
     /** 商户结算金额 */