Merge branch 'master' of https://e.coding.net/g-cphe0354/shouyinjixitong/cashier-client

src/main/resources/mapper/ShopUserDutyMapper.xml

@@ -224,4 +224,8 @@
   <update id="updateStatusByTokenId">
       update tb_shop_user_duty set status = '1' , login_out_time = now(),user_id = #{staffId} where shop_id = #{shopId} and trade_day = #{day} and status = '0'
   </update>
+
+    <select id="selectByShopIdAndDay" resultMap="BaseResultMap">
+        select * from  tb_shop_user_duty where trade_day = #{day} and shop_id = #{shopId} order by id desc limit 1
+    </select>
 </mapper>