Merge remote-tracking branch 'origin/master'

src/main/resources/mapper/pc/AdminUserMapper.xml

@@ -74,6 +74,8 @@
     <select id="login" resultType="com.ycwl.basic.model.pc.adminUser.entity.LoginEntity">
         select
                au.account,
+               au.name as staffName,
+               au.id as staffId,
                au.password,
                au.role_id
         from admin_user au

src/main/resources/mapper/pc/OrderOperationMapper.xml

@@ -0,0 +1,13 @@
+<?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.ycwl.basic.mapper.pc.OrderOperationMapper">
+    <insert id="add">
+        insert into order_operation (order_id, type, remark, `user`, user_id, create_time)
+        values (#{orderId}, #{type}, #{remark}, #{user}, #{userId}, now());
+    </insert>
+    <select id="list" resultType="com.ycwl.basic.model.pc.orderOp.entity.OrderOperationEntity">
+        select * from order_operation
+        where order_id = #{orderId}
+        order by create_time desc
+    </select>
+</mapper>