From 81aaee286ba7f54ef1b713fedd6d24a9294745df Mon Sep 17 00:00:00 2001
From: 克 刘 <4345453@qq.com>
Date: Thu, 02 Apr 2020 14:45:19 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev
---
kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-biz/src/main/resources/mapper/SysProductMapper.xml | 68 +++++++++++++++++-----------------
1 files changed, 34 insertions(+), 34 deletions(-)
diff --git a/kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-biz/src/main/resources/mapper/SysProductMapper.xml b/kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-biz/src/main/resources/mapper/SysProductMapper.xml
index 530c816..3ff4d14 100644
--- a/kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-biz/src/main/resources/mapper/SysProductMapper.xml
+++ b/kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-biz/src/main/resources/mapper/SysProductMapper.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<!---->
-<mapper namespace="com.kidgrow.oprationcenter.mapper.SysProductMapper">
+<mapper namespace="com.kidgrow.usercenter.mapper.SysProductMapper">
<!--定义查询列-->
<sql id="Column_List">
*
@@ -11,57 +11,57 @@
<sql id="where">
<where>
<!--查询条件自行添加-->
- is_del=0
- <if test="id != null and id !=''">
- and id = #{id}
+ p.is_del=0
+ <if test="p.id != null and p.id !=''">
+ and id = #{p.id}
</if>
- <if test="proName != null and proName !=''">
- and pro_name = #{proName}
+ <if test="p.proName != null and p.proName !=''">
+ and pro_name = #{p.proName}
</if>
- <if test="proTime != null and proTime !=''">
- and pro_time = #{proTime}
+ <if test="p.proTime != null and p.proTime !=''">
+ and pro_time = #{p.proTime}
</if>
- <if test="proType != null and proType !=''">
- and pro_type = #{proType}
+ <if test="p.proType != null and p.proType !=''">
+ and pro_type = #{p.proType}
</if>
- <if test="proPrice != null and proPrice !=''">
- and pro_price = #{proPrice}
+ <if test="p.proPrice != null and p.proPrice !=''">
+ and pro_price = #{p.proPrice}
</if>
- <if test="recordCount != null and recordCount !=''">
- and record_count = #{recordCount}
+ <if test="p.recordCount != null and p.recordCount !=''">
+ and record_count = #{p.recordCount}
</if>
- <if test="ailightCount != null and ailightCount !=''">
- and ailight_count = #{ailightCount}
+ <if test="p.ailightCount != null and p.ailightCount !=''">
+ and ailight_count = #{p.ailightCount}
</if>
- <if test="isDel != null and isDel !=''">
- and is_del = #{isDel}
+ <if test="p.isDel != null and p.isDel !=''">
+ and is_del = #{p.isDel}
</if>
- <if test="enabled != null and enabled !=''">
- and enabled = #{enabled}
+ <if test="p.enabled != null and p.enabled !=''">
+ and enabled = #{p.enabled}
</if>
- <if test="createUserId != null and createUserId !=''">
- and create_user_id = #{createUserId}
+ <if test="p.createUserId != null and p.createUserId !=''">
+ and create_user_id = #{p.createUserId}
</if>
- <if test="createUserName != null and createUserName !=''">
- and create_user_name = #{createUserName}
+ <if test="p.createUserName != null and p.createUserName !=''">
+ and create_user_name = #{p.createUserName}
</if>
- <if test="updateUserId != null and updateUserId !=''">
- and update_user_id = #{updateUserId}
+ <if test="p.updateUserId != null and p.updateUserId !=''">
+ and update_user_id = #{p.updateUserId}
</if>
- <if test="updateUserName != null and updateUserName !=''">
- and update_user_name = #{updateUserName}
+ <if test="p.updateUserName != null and p.updateUserName !=''">
+ and update_user_name = #{p.updateUserName}
</if>
- <if test="createTime != null and createTime !=''">
- and create_time = #{createTime}
+ <if test="p.createTime != null and p.createTime !=''">
+ and create_time = #{p.createTime}
</if>
- <if test="updateTime != null and updateTime !=''">
- and update_time = #{updateTime}
+ <if test="p.updateTime != null and p.updateTime !=''">
+ and update_time = #{p.updateTime}
</if>
</where>
</sql>
<!--定义根据-SysProduct当作查询条件返回对象-->
- <select id="findByObject" resultType="com.kidgrow.oprationcenter.model.SysProduct">
+ <select id="findByObject" resultType="com.kidgrow.usercenter.model.SysProduct">
select <include refid="Column_List"/>
from sys_product
<include refid="where"/>
@@ -69,7 +69,7 @@
</select>
<!--定义根据-SysProduct当作查询条件返回对象集合-->
- <select id="findList" resultType="com.kidgrow.oprationcenter.model.SysProduct">
+ <select id="findList" resultType="com.kidgrow.usercenter.model.SysProduct">
select <include refid="Column_List"/>
from sys_product
order by id desc
--
Gitblit v1.8.0