Merge branch 'master' of http://git.iamberry.com/hexiugang/iamberry-common-parent

watero-rst-service/src/main/java/com/iamberry/rst/service/customer/mapper/CustomerBasicMapper.xml

@@ -545,6 +545,8 @@
         t.product_name
         FROM
         tb_rst_product_info t
+        WHERE
+        t.product_wholesale = '1'
         ORDER BY
         t.product_id ASC
     </select>
@@ -636,7 +638,7 @@
 
     <update id="updateOpeningInfo" parameterType="TicketOpeningInfo">
         UPDATE tb_rst_ticket_opening_info
-        <set >
+        <set>
             <if test="ticketType != null and ticketType !='' " >
                 ticket_type = #{ticketType},
             </if>