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

diagbotman-service/src/main/resources/mapper/OpenedProductsMapper.xml

@@ -22,7 +22,7 @@
     </resultMap>
 
     <!-- 通用查询映射结果 -->
-    <resultMap id="BaseResultWrapper" type="com.diagbot.entity.wrapper.OpendProductWrapper">
+    <resultMap id="BaseResultWrapper" type="com.diagbot.dto.OpendProductDTO">
         <id column="id" property="id"/>
         <result column="product_id" property="productId"/>
         <result column="user_id" property="userId"/>
@@ -196,7 +196,7 @@
         AND a.product_id = #{productId}
     </update>
 
-    <select id="getByProductId" resultType="com.diagbot.entity.wrapper.OpendProductWrapper">
+    <select id="getByProductId" resultType="com.diagbot.dto.OpendProductDTO">
         SELECT a.*,b.time order_time from diag_opened_products a
         LEFT JOIN diag_product_order b ON a.order_id =b.id
         WHERE product_id =#{opend.productId} AND a.is_deleted='N'