Merge branch 'ww' into test
# Conflicts: # eladmin-system/src/main/resources/mapper/TbActivateMapper.xml
This commit is contained in:
@@ -1,12 +0,0 @@
|
||||
<?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="cn.ysk.cashier.mybatis.mapper.TbActivateMapper">
|
||||
|
||||
<sql id="Base_Column_List">
|
||||
id,shop_id,min_num,
|
||||
max_num,handsel_num,handsel_type,
|
||||
is_del,is_user
|
||||
</sql>
|
||||
</mapper>
|
||||
Reference in New Issue
Block a user