Commit 8664a720 by huluobin

# update

parent efc3ed68
...@@ -151,7 +151,6 @@ ...@@ -151,7 +151,6 @@
order by t1.index_sort desc order by t1.index_sort desc
</otherwise> </otherwise>
</choose> </choose>
</select> </select>
<select id="queryProduceServiceDuration" resultType="com.gogirl.shared.product.CalcServiceDuration"> <select id="queryProduceServiceDuration" resultType="com.gogirl.shared.product.CalcServiceDuration">
...@@ -164,15 +163,16 @@ ...@@ -164,15 +163,16 @@
<select id="exportBaseProduce" resultType="com.gogirl.shared.product.BaseProduceDto"> <select id="exportBaseProduce" resultType="com.gogirl.shared.product.BaseProduceDto">
select t1.`name`, select t1.`name`,
t2.`name` serve_name, t2.`name` serve_name,
t2.type serve_type, t2.type serve_type,
t1.service_duration, t1.service_duration,
t1.current_price, t1.current_price,
t1.bargain_price, t1.bargain_price,
if(t1.`status`=1,'上架','下架') `status` if(t1.`status` = 1, '上架', '下架') `status`
from base_produce t1 from base_produce t1
left join base_serve t2 on t1.service_id = t2.id left join base_serve t2 on t1.service_id = t2.id
where t1.`status` !=4 and t2.id is not null where t1.`status` != 4
and t2.id is not null
</select> </select>
......
...@@ -80,7 +80,7 @@ ...@@ -80,7 +80,7 @@
'高级会员免费卸甲(脚部)', '高级会员免费卸甲(脚部)',
'免费睫毛卸除(会员福利)', '免费睫毛卸除(会员福利)',
'贵族会员免费手部基础护理', '贵族会员免费手部基础护理',
'10天内售后补睫毛', # '10天内售后补睫毛',
'睫毛(卸除)', '睫毛(卸除)',
'精细日式卸甲(手部)', '精细日式卸甲(手部)',
'精细日式卸甲(脚部)', '精细日式卸甲(脚部)',
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment