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

huliguo

7 天以前 c897a68da55d63439826d37be3cb13c5c0f95a48

 ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/domain/dto/AppGoodsInfoGetDto.java

@@ -1,5 +1,6 @@
package com.ruoyi.order.domain.dto;

import com.ruoyi.system.api.domain.dto.AppBaseGetDto;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;