diff --git a/src/main/java/com/zcloud/controller/sms/PayController.java b/src/main/java/com/zcloud/controller/sms/PayController.java
index 996ca34..4385f98 100644
--- a/src/main/java/com/zcloud/controller/sms/PayController.java
+++ b/src/main/java/com/zcloud/controller/sms/PayController.java
@@ -4,7 +4,7 @@ import com.zcloud.controller.base.BaseController;
 import com.zcloud.entity.PageData;
 import com.zcloud.logs.LogAnno;
 import com.zcloud.service.corp.CorpInfoService;
-import com.zcloud.service.sms.BillingManageService;
+import com.zcloud.service.invoice.BillingManageService;
 import com.zcloud.service.sms.PayManagerService;
 import com.zcloud.service.sms.PayService;
 import com.zcloud.util.DateUtil;
diff --git a/src/main/java/com/zcloud/controller/speEquip/SpecialEquipmentController.java b/src/main/java/com/zcloud/controller/speEquip/SpecialEquipmentController.java
index e217863..064aa02 100644
--- a/src/main/java/com/zcloud/controller/speEquip/SpecialEquipmentController.java
+++ b/src/main/java/com/zcloud/controller/speEquip/SpecialEquipmentController.java
@@ -4,9 +4,9 @@ import com.zcloud.controller.base.BaseController;
 import com.zcloud.entity.Page;
 import com.zcloud.entity.PageData;
 import com.zcloud.logs.LogAnno;
+import com.zcloud.service.check.SysDateService;
 import com.zcloud.service.speEquip.SpecialEquipmentChangeService;
 import com.zcloud.service.speEquip.SpecialEquipmentService;
-import com.zcloud.service.speEquip.SysDateService;
 import com.zcloud.service.system.DepartmentService;
 import com.zcloud.service.system.DictionariesService;
 import com.zcloud.service.system.UsersService;
diff --git a/src/main/java/com/zcloud/mapper/datasource/filemanager/MfolderStipulateMapper.java b/src/main/java/com/zcloud/mapper/datasource/filemanager/MfolderStipulateMapper.java
index 9ffbf3d..1e24d6b 100644
--- a/src/main/java/com/zcloud/mapper/datasource/filemanager/MfolderStipulateMapper.java
+++ b/src/main/java/com/zcloud/mapper/datasource/filemanager/MfolderStipulateMapper.java
@@ -64,5 +64,8 @@ public interface MfolderStipulateMapper{
 	 */
 	List<Mfolder> listByParentId(PageData pd);
 
+	List<Mfolder> findByParentId(String parentid);
+
+	List<PageData> findByName(PageData pd);
 }
 
diff --git a/src/main/java/com/zcloud/mapper/datasource/sms/BillingManageMapper.java b/src/main/java/com/zcloud/mapper/datasource/sms/BillingManageMapper.java
deleted file mode 100644
index 64c9b0a..0000000
--- a/src/main/java/com/zcloud/mapper/datasource/sms/BillingManageMapper.java
+++ /dev/null
@@ -1,60 +0,0 @@
-package com.zcloud.mapper.datasource.sms;
-
-import com.zcloud.entity.Page;
-import com.zcloud.entity.PageData;
-
-import java.util.List;
-
-/**
- * 说明：开票管理
- * 作者：luoxiaobao
- * 时间：2021-03-23
- * 官网：www.zcloudchina.com
- */
-public interface BillingManageMapper {
-
-	/**新增
-	 * @param pd
-	 * @throws Exception
-	 */
-	void save(PageData pd);
-
-	/**删除
-	 * @param pd
-	 * @throws Exception
-	 */
-	void delete(PageData pd);
-
-	/**修改
-	 * @param pd
-	 * @throws Exception
-	 */
-	void edit(PageData pd);
-	void editkp(PageData pd);
-
-	/**列表
-	 * @param page
-	 * @throws Exception
-	 */
-	List<PageData> datalistPage(Page page);
-
-	/**列表(全部)
-	 * @param pd
-	 * @throws Exception
-	 */
-	List<PageData> listAll(PageData pd);
-
-	/**通过id获取数据
-	 * @param pd
-	 * @throws Exception
-	 */
-	PageData findById(PageData pd);
-
-	/**批量删除
-	 * @param ArrayDATA_IDS
-	 * @throws Exception
-	 */
-	void deleteAll(String[] ArrayDATA_IDS);
-
-}
-
diff --git a/src/main/java/com/zcloud/mapper/datasource/speEquip/SysDateMapper.java b/src/main/java/com/zcloud/mapper/datasource/speEquip/SysDateMapper.java
deleted file mode 100644
index 499f371..0000000
--- a/src/main/java/com/zcloud/mapper/datasource/speEquip/SysDateMapper.java
+++ /dev/null
@@ -1,28 +0,0 @@
-package com.zcloud.mapper.datasource.speEquip;
-
-import com.zcloud.entity.PageData;
-
-import java.util.List;
-
-/**
- * 说明：系统日期
- * 作者：luoxiaobao
- * 时间：2021-05-07
- * 官网：www.zcloudchina.com
- */
-public interface SysDateMapper {
-
-	/**节假日
-	 * @param pd
-	 * @throws Exception
-	 */
-	List<PageData> listAllByJjr(PageData pd);
-
-	/**通过Date获取数据
-	 * @param pd
-	 * @throws Exception
-	 */
-	PageData findByDate(PageData pd);
-
-}
-
diff --git a/src/main/java/com/zcloud/mapper/datasource/study/MfolderStipulateMapper.java b/src/main/java/com/zcloud/mapper/datasource/study/MfolderStipulateMapper.java
deleted file mode 100644
index db19dfe..0000000
--- a/src/main/java/com/zcloud/mapper/datasource/study/MfolderStipulateMapper.java
+++ /dev/null
@@ -1,71 +0,0 @@
-package com.zcloud.mapper.datasource.study;
-
-import com.zcloud.entity.Page;
-import com.zcloud.entity.PageData;
-import com.zcloud.entity.system.Mfolder;
-
-import java.util.List;
-
-/**
- * 说明： 文件管理Mapper
- * 作者：zCloud
- * 官网：
- * @version
- */
-public interface MfolderStipulateMapper {
-
-	/**新增
-	 * @param pd
-	 * @throws Exception
-	 */
-	void save(PageData pd);
-
-	/**删除
-	 * @param pd
-	 * @throws Exception
-	 */
-	void delete(PageData pd);
-
-	/**修改
-	 * @param pd
-	 * @throws Exception
-	 */
-	void edit(PageData pd);
-
-	/**批量操作
-	 * @param pd
-	 * @throws Exception
-	 */
-	void makeAll(PageData pd);
-
-	/**列表
-	 * @param page
-	 * @throws Exception
-	 */
-	List<PageData> datalistPage(Page page);
-
-	/**列表(全部)
-	 * @param pd
-	 * @throws Exception
-	 */
-	List<PageData> listAll(PageData pd);
-
-	/**通过id获取数据
-	 * @param pd
-	 * @throws Exception
-	 */
-	PageData findById(PageData pd);
-
-	/**
-	 * 通过ID获取其子级列表
-	 * @param parentId
-	 * @return
-	 * @throws Exception
-	 */
-	List<Mfolder> listByParentId(PageData pd);
-
-    List<Mfolder> findByParentId(String parentid);
-
-	List<PageData> findByName(PageData pd);
-}
-
diff --git a/src/main/java/com/zcloud/service/sms/BillingManageService.java b/src/main/java/com/zcloud/service/sms/BillingManageService.java
deleted file mode 100644
index 86809b2..0000000
--- a/src/main/java/com/zcloud/service/sms/BillingManageService.java
+++ /dev/null
@@ -1,60 +0,0 @@
-package com.zcloud.service.sms;
-
-import com.zcloud.entity.Page;
-import com.zcloud.entity.PageData;
-
-import java.util.List;
-
-/**
- * 说明：开票管理
- * 作者：luoxiaobao
- * 时间：2021-03-23
- * 官网：www.zcloudchina.com
- */
-public interface BillingManageService {
-
-	/**新增
-	 * @param pd
-	 * @throws Exception
-	 */
-	public void save(PageData pd)throws Exception;
-
-	/**删除
-	 * @param pd
-	 * @throws Exception
-	 */
-	public void delete(PageData pd)throws Exception;
-
-	/**修改
-	 * @param pd
-	 * @throws Exception
-	 */
-	public void edit(PageData pd)throws Exception;
-	public void editkp(PageData pd)throws Exception;
-
-	/**列表
-	 * @param page
-	 * @throws Exception
-	 */
-	public List<PageData> list(Page page)throws Exception;
-
-	/**列表(全部)
-	 * @param pd
-	 * @throws Exception
-	 */
-	public List<PageData> listAll(PageData pd)throws Exception;
-
-	/**通过id获取数据
-	 * @param pd
-	 * @throws Exception
-	 */
-	public PageData findById(PageData pd)throws Exception;
-
-	/**批量删除
-	 * @param ArrayDATA_IDS
-	 * @throws Exception
-	 */
-	public void deleteAll(String[] ArrayDATA_IDS)throws Exception;
-
-}
-
diff --git a/src/main/java/com/zcloud/service/sms/impl/BillingManageServiceImpl.java b/src/main/java/com/zcloud/service/sms/impl/BillingManageServiceImpl.java
deleted file mode 100644
index a636d7f..0000000
--- a/src/main/java/com/zcloud/service/sms/impl/BillingManageServiceImpl.java
+++ /dev/null
@@ -1,87 +0,0 @@
-package com.zcloud.service.sms.impl;
-
-import com.zcloud.entity.Page;
-import com.zcloud.entity.PageData;
-import com.zcloud.mapper.datasource.sms.BillingManageMapper;
-import com.zcloud.service.sms.BillingManageService;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-import org.springframework.transaction.annotation.Transactional;
-
-import java.util.List;
-
-/**
- * 说明：开票管理
- * 作者：luoxiaobao
- * 时间：2021-03-23
- * 官网：www.zcloudchina.com
- */
-@Service
-@Transactional //开启事物
-public class BillingManageServiceImpl implements BillingManageService {
-
-	@Autowired
-	private BillingManageMapper billingmanageMapper;
-
-	/**新增
-	 * @param pd
-	 * @throws Exception
-	 */
-	public void save(PageData pd)throws Exception{
-		billingmanageMapper.save(pd);
-	}
-
-	/**删除
-	 * @param pd
-	 * @throws Exception
-	 */
-	public void delete(PageData pd)throws Exception{
-		billingmanageMapper.delete(pd);
-	}
-
-	/**修改
-	 * @param pd
-	 * @throws Exception
-	 */
-	public void edit(PageData pd)throws Exception{
-		billingmanageMapper.edit(pd);
-	}
-
-	public void editkp(PageData pd)throws Exception{
-		billingmanageMapper.editkp(pd);
-	}
-
-	/**列表
-	 * @param page
-	 * @throws Exception
-	 */
-	public List<PageData> list(Page page)throws Exception{
-		return billingmanageMapper.datalistPage(page);
-	}
-
-	/**列表(全部)
-	 * @param pd
-	 * @throws Exception
-	 */
-	public List<PageData> listAll(PageData pd)throws Exception{
-		return billingmanageMapper.listAll(pd);
-	}
-
-	/**通过id获取数据
-	 * @param pd
-	 * @throws Exception
-	 */
-	public PageData findById(PageData pd)throws Exception{
-		return billingmanageMapper.findById(pd);
-	}
-
-	/**批量删除
-	 * @param ArrayDATA_IDS
-	 * @throws Exception
-	 */
-	public void deleteAll(String[] ArrayDATA_IDS)throws Exception{
-		billingmanageMapper.deleteAll(ArrayDATA_IDS);
-	}
-
-}
-
diff --git a/src/main/java/com/zcloud/service/speEquip/SysDateService.java b/src/main/java/com/zcloud/service/speEquip/SysDateService.java
deleted file mode 100644
index b9ef9fd..0000000
--- a/src/main/java/com/zcloud/service/speEquip/SysDateService.java
+++ /dev/null
@@ -1,28 +0,0 @@
-package com.zcloud.service.speEquip;
-
-import com.zcloud.entity.PageData;
-
-import java.util.List;
-
-/**
- * 说明：系统日期
- * 作者：luoxiaobao
- * 时间：2021-05-07
- * 官网：www.zcloudchina.com
- */
-public interface SysDateService {
-
-	/**节假日
-	 * @param pd
-	 * @throws Exception
-	 */
-	public List<PageData> listAllByJjr(PageData pd)throws Exception;
-
-	/**通过Date获取数据
-	 * @param pd
-	 * @throws Exception
-	 */
-	public PageData findByDate(PageData pd)throws Exception;
-
-}
-
diff --git a/src/main/java/com/zcloud/service/speEquip/impl/SysDateServiceImpl.java b/src/main/java/com/zcloud/service/speEquip/impl/SysDateServiceImpl.java
deleted file mode 100644
index 19d4bbc..0000000
--- a/src/main/java/com/zcloud/service/speEquip/impl/SysDateServiceImpl.java
+++ /dev/null
@@ -1,41 +0,0 @@
-package com.zcloud.service.speEquip.impl;
-
-import com.zcloud.entity.PageData;
-import com.zcloud.mapper.datasource.speEquip.SysDateMapper;
-import com.zcloud.service.speEquip.SysDateService;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-import org.springframework.transaction.annotation.Transactional;
-
-import java.util.List;
-
-/**
- * 说明：系统日期
- * 作者：luoxiaobao
- * 时间：2021-05-07
- * 官网：www.zcloudchina.com
- */
-@Service
-@Transactional //开启事物
-public class SysDateServiceImpl implements SysDateService {
-
-	@Autowired
-	private SysDateMapper sysdateMapper;
-
-	/**节假日
-	 * @param pd
-	 * @throws Exception
-	 */
-	public List<PageData> listAllByJjr(PageData pd)throws Exception{
-		return sysdateMapper.listAllByJjr(pd);
-	}
-	/**通过Date获取数据
-	 * @param pd
-	 * @throws Exception
-	 */
-	public PageData findByDate(PageData pd)throws Exception{
-		return sysdateMapper.findByDate(pd);
-	}
-
-}
-
diff --git a/src/main/java/com/zcloud/service/study/impl/MfolderStipulateServiceImpl.java b/src/main/java/com/zcloud/service/study/impl/MfolderStipulateServiceImpl.java
index 5bdc60c..b3c667a 100644
--- a/src/main/java/com/zcloud/service/study/impl/MfolderStipulateServiceImpl.java
+++ b/src/main/java/com/zcloud/service/study/impl/MfolderStipulateServiceImpl.java
@@ -3,7 +3,7 @@ package com.zcloud.service.study.impl;
 import com.zcloud.entity.Page;
 import com.zcloud.entity.PageData;
 import com.zcloud.entity.system.Mfolder;
-import com.zcloud.mapper.datasource.study.MfolderStipulateMapper;
+import com.zcloud.mapper.datasource.filemanager.MfolderStipulateMapper;
 import com.zcloud.service.study.MfolderStipulateService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
diff --git a/src/main/resources/application.properties b/src/main/resources/application.properties
index 1132510..9a95565 100644
--- a/src/main/resources/application.properties
+++ b/src/main/resources/application.properties
@@ -51,7 +51,7 @@ spring.activiti.check-process-definitions=false
 #Mq配置
 rocketmq.consumer.group2=edu-admin-edit
 rocketmq.consumer.group1=edu-admin-add
-rocketmq.name-server=172.24.151.18:9876
+rocketmq.name-server=192.168.0.31:9876
 rocketmq.producer.group=libmiddle
 rocketmq.producer.send-message-timeout=3000
 rocketmq.producer.compress-message-body-threshold=4096
diff --git a/src/main/resources/mybatis/datasource/filemanager/MfolderStipulateMapper.xml b/src/main/resources/mybatis/datasource/filemanager/MfolderStipulateMapper.xml
index 50e6977..b4b28e1 100644
--- a/src/main/resources/mybatis/datasource/filemanager/MfolderStipulateMapper.xml
+++ b/src/main/resources/mybatis/datasource/filemanager/MfolderStipulateMapper.xml
@@ -187,6 +187,30 @@
 		order by f.NAME
 	</select>
 
+	<!-- 通过ID获取其子级列表 -->
+	<select id="findByParentId" parameterType="String" resultMap="mfolderResultMap">
+		select
+		<include refid="Field"></include>
+		from
+		<include refid="tableName"></include> f
+		where
+		f.PARENT_ID = #{parentId}
+		and f.SHARE = 'yes'
+		order by f.CTIME desc
+	</select>
+
+	<!-- 通过ID获取其子级列表 -->
+	<select id="findByName" parameterType="pd" resultType="pd">
+		select
+		<include refid="Field"></include>
+		from
+		<include refid="tableName"></include> f
+		where
+		f.NAME LIKE CONCAT(CONCAT('%', #{KEYWORDS}),'%')
+		and f.SHARE = 'yes'
+		order by f.CTIME desc
+	</select>
+
 	<!-- 根据ID组修改数据 -->
 	<update id="makeAll" parameterType="pd">
 		update
diff --git a/src/main/resources/mybatis/datasource/sms/BillingManageMapper.xml b/src/main/resources/mybatis/datasource/sms/BillingManageMapper.xml
deleted file mode 100644
index a881f24..0000000
--- a/src/main/resources/mybatis/datasource/sms/BillingManageMapper.xml
+++ /dev/null
@@ -1,160 +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="com.zcloud.mapper.datasource.sms.BillingManageMapper">
-
-	<!--表名 -->
-	<sql id="tableName">
-		BUS_BILLINGMANAGE
-	</sql>
-
-	<!--数据字典表名 -->
-	<sql id="dicTableName">
-		SYS_DICTIONARIES
-	</sql>
-
-	<!-- 字段 -->
-	<sql id="Field">
-		f.PAYMENTTIME,
-		f.MONEY,
-		f.BILLINGSTATUS,
-		f.INVOICEMANAGER_ID,
-		f.ISDELETE,
-		f.BILLINGMANAGE_ID,
-		f.CORPINFO_ID,
-		f.OPDATE,
-		f.FPURL,
-		f.OPUSER
-
-	</sql>
-
-	<!-- 字段用于新增 -->
-	<sql id="Field2">
-		PAYMENTTIME,
-		MONEY,
-		BILLINGSTATUS,
-		INVOICEMANAGER_ID,
-		ISDELETE,
-		BILLINGMANAGE_ID,
-		CORPINFO_ID,
-		OPDATE,
-		FPURL,
-		OPUSER
-	</sql>
-
-	<!-- 字段值 -->
-	<sql id="FieldValue">
-		#{PAYMENTTIME},
-		#{MONEY},
-		#{BILLINGSTATUS},
-		#{INVOICEMANAGER_ID},
-		#{ISDELETE},
-		#{BILLINGMANAGE_ID},
-		#{CORPINFO_ID},
-		#{OPDATE},
-		#{FPURL},
-		#{OPUSER}
-	</sql>
-
-	<!-- 新增-->
-	<insert id="save" parameterType="pd">
-		insert into
-	<include refid="tableName"></include>
-		(
-	<include refid="Field2"></include>
-		) values (
-	<include refid="FieldValue"></include>
-		)
-	</insert>
-
-	<!-- 删除-->
-	<delete id="delete" parameterType="pd">
-		update
-		<include refid="tableName"></include>
-		set
-			ISDELETE = '1'
-		where
-			BILLINGMANAGE_ID = #{BILLINGMANAGE_ID}
-	</delete>
-
-	<!-- 修改 -->
-	<update id="edit" parameterType="pd">
-		update
-		<include refid="tableName"></include>
-		set
-			BILLINGMANAGE_ID = BILLINGMANAGE_ID
-		where
-			BILLINGMANAGE_ID = #{BILLINGMANAGE_ID}
-	</update>
-	<update id="editkp" parameterType="pd">
-		update
-		<include refid="tableName"></include>
-		set
-			BILLINGSTATUS= '1',
-			INVOICEMANAGER_ID = #{INVOICEMANAGER_ID}
-		where
-			BILLINGMANAGE_ID = #{BILLINGMANAGE_ID}
-	</update>
-
-	<!-- 通过ID获取数据 -->
-	<select id="findById" parameterType="pd" resultType="pd">
-		select
-		<include refid="Field"></include>
-		from
-		<include refid="tableName"></include> f
-		where
-			f.BILLINGMANAGE_ID = #{BILLINGMANAGE_ID}
-	</select>
-
-	<!-- 列表 -->
-	<select id="datalistPage" parameterType="page" resultType="pd">
-		select
-		<include refid="Field"></include>,
-		i.ENTERPRISENAME,
-		i.UCODE,
-		i.ADDRESS,
-		i.PHONE,
-		i.SNAME,
-		(select FILEPATH from bus_imgfiles where FOREIGN_KEY=f.BILLINGMANAGE_ID) as FILEPATH
-		from
-		<include refid="tableName"></include> f
-			left join  bus_invoicemanager i on f.INVOICEMANAGER_ID=i.INVOICEMANAGER_ID
-		where f.ISDELETE = '0'
-		<if test="pd.KEYWORDS != null and pd.KEYWORDS != ''"><!-- 关键词检索 -->
-			and
-				(
-				<!--	根据需求自己加检索条件
-					字段1 LIKE CONCAT(CONCAT('%', #{pd.KEYWORDS}),'%')
-					 or
-					字段2 LIKE CONCAT(CONCAT('%', #{pd.KEYWORDS}),'%')
-				-->
-				)
-		</if>
-		<if test="pd.CORPINFO_ID != null and pd.CORPINFO_ID != ''"><!-- 关键词检索 -->
-			and f.CORPINFO_ID= #{pd.CORPINFO_ID}
-		</if>
-
-		ORDER by BILLINGSTATUS asc,OPDATE desc
-	</select>
-
-	<!-- 列表(全部) -->
-	<select id="listAll" parameterType="pd" resultType="pd">
-		select
-		<include refid="Field"></include>
-		from
-		<include refid="tableName"></include> f
-	</select>
-
-	<!-- 批量删除 -->
-	<delete id="deleteAll" parameterType="String">
-		update
-		<include refid="tableName"></include>
-		set
-			ISDELETE = '1'
-		where
-			BILLINGMANAGE_ID in
-		<foreach item="item" index="index" collection="ArrayDATA_IDS" open="(" separator="," close=")">
-                 #{item}
-		</foreach>
-	</delete>
-
-</mapper>
diff --git a/src/main/resources/mybatis/datasource/speEquip/SysDateMapper.xml b/src/main/resources/mybatis/datasource/speEquip/SysDateMapper.xml
deleted file mode 100644
index 9356f26..0000000
--- a/src/main/resources/mybatis/datasource/speEquip/SysDateMapper.xml
+++ /dev/null
@@ -1,53 +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="com.zcloud.mapper.datasource.speEquip.SysDateMapper">
-
-	<!--表名 -->
-	<sql id="tableName">
-		V_SYSDATE
-	</sql>
-
-	<!--数据字典表名 -->
-	<sql id="dicTableName">
-		SYS_DICTIONARIES
-	</sql>
-
-	<!-- 字段 -->
-	<sql id="Field">
-		DATE_FORMAT(f.DATE,'%Y-%m-%d %H:%i:%s')  DATE,
-		DATE_FORMAT(f.DAY_START,'%Y-%m-%d %H:%i:%s')  DAY_START,
-		DATE_FORMAT(f.DAY_END,'%Y-%m-%d %H:%i:%s')  DAY_END,
-		DATE_FORMAT(f.WEEK_START,'%Y-%m-%d %H:%i:%s')  WEEK_START,
-		DATE_FORMAT(f.WEEK_END,'%Y-%m-%d %H:%i:%s')  WEEK_END,
-		DATE_FORMAT(f.XUN_START,'%Y-%m-%d %H:%i:%s')  XUN_START,
-		DATE_FORMAT(f.XUN_END,'%Y-%m-%d %H:%i:%s')  XUN_END,
-		DATE_FORMAT(f.MONTH_START,'%Y-%m-%d %H:%i:%s')  MONTH_START,
-		DATE_FORMAT(f.MONTH_END,'%Y-%m-%d %H:%i:%s')  MONTH_END,
-		DATE_FORMAT(f.QUARTER_START,'%Y-%m-%d %H:%i:%s')  QUARTER_START,
-		DATE_FORMAT(f.QUARTER_END,'%Y-%m-%d %H:%i:%s')  QUARTER_END,
-		DATE_FORMAT(f.HALFYEAR_START,'%Y-%m-%d %H:%i:%s')  HALFYEAR_START,
-		DATE_FORMAT(f.HALFYEAR_END,'%Y-%m-%d %H:%i:%s')  HALFYEAR_END,
-		DATE_FORMAT(f.YEAR_START,'%Y-%m-%d %H:%i:%s')  YEAR_START,
-		DATE_FORMAT(f.YEAR_END,'%Y-%m-%d %H:%i:%s')  YEAR_END
-	</sql>
-
-	<!-- 节假日 -->
-	<select id="listAllByJjr" parameterType="pd" resultType="pd">
-		select
-		<include refid="Field"></include>
-		from
-		<include refid="tableName"></include> f
-		${SQL}
-	</select>
-
-	<!-- 通过ID获取数据 -->
-	<select id="findByDate" parameterType="pd" resultType="pd">
-		select
-		<include refid="Field"></include>
-		from
-		<include refid="tableName"></include> f
-		where
-		f.DATE = DATE_FORMAT(#{DATE},'%Y-%m-%d')
-	</select>
-
-</mapper>
diff --git a/src/main/resources/mybatis/datasource/study/MfolderStipulateMapper.xml b/src/main/resources/mybatis/datasource/study/MfolderStipulateMapper.xml
deleted file mode 100644
index b96b34c..0000000
--- a/src/main/resources/mybatis/datasource/study/MfolderStipulateMapper.xml
+++ /dev/null
@@ -1,247 +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="com.zcloud.mapper.datasource.study.MfolderStipulateMapper">
-	<resultMap type="Mfolder" id="mfolderResultMap">
-		<id column="MFOLDER_ID" property="MFOLDER_ID"/>
-		<result column="NAME" property="NAME"/>
-		<result column="PARENT_ID" property="PARENT_ID"/>
-	</resultMap>
-
-	<!--表名 -->
-	<sql id="tableName">
-		OA_MFOLDER_STIPULATE
-	</sql>
-
-	<!--数据字典表名 -->
-	<sql id="dicTableName">
-		SYS_DICTIONARIES
-	</sql>
-
-	<!-- 字段 -->
-	<sql id="Field">
-		f.FILEPATH,
-		f.CTIME,
-		f.UNAME,
-		f.MASTER,
-		f.FILESIZE,
-		f.SHARE,
-		f.REMARKS,
-		f.MFOLDER_ID,
-		f.PARENT_ID,
-		f.NAME,
-		f.CORPINFO_ID,
-		f.TYPE,
-		f.POSTNO,
-		f.UNIT,
-		f.STARTTIME,
-		f.ENDTIME,
-		f.ISVALID
-	</sql>
-
-	<!-- 字段用于新增 -->
-	<sql id="Field2">
-		FILEPATH,
-		CTIME,
-		UNAME,
-		MASTER,
-		FILESIZE,
-		SHARE,
-		REMARKS,
-		MFOLDER_ID,
-		PARENT_ID,
-		NAME,
-		CORPINFO_ID,
-		TYPE,
-		POSTNO,
-		UNIT,
-		STARTTIME,
-		ENDTIME,
-		ISVALID
-	</sql>
-
-	<!-- 字段值 -->
-	<sql id="FieldValue">
-		#{FILEPATH},
-		#{CTIME},
-		#{UNAME},
-		#{MASTER},
-		#{FILESIZE},
-		#{SHARE},
-		#{REMARKS},
-		#{MFOLDER_ID},
-		#{PARENT_ID},
-		#{NAME},
-		#{CORPINFO_ID},
-		#{TYPE},
-		#{POSTNO},
-		#{UNIT},
-		#{STARTTIME},
-		#{ENDTIME},
-		#{ISVALID}
-	</sql>
-
-	<!-- 新增-->
-	<insert id="save" parameterType="pd">
-		insert into
-	<include refid="tableName"></include>
-		(
-	<include refid="Field2"></include>
-		) values (
-	<include refid="FieldValue"></include>
-		)
-	</insert>
-
-	<!-- 删除-->
-	<delete id="delete" parameterType="pd">
-		delete from
-		<include refid="tableName"></include>
-		where
-			MFOLDER_ID = #{MFOLDER_ID}
-	</delete>
-
-	<!-- 修改 -->
-	<update id="edit" parameterType="pd">
-		update
-		<include refid="tableName"></include>
-		set
-			SHARE = #{SHARE},
-			REMARKS = #{REMARKS},
-			NAME = #{NAME},
-			TYPE = #{TYPE},
-			POSTNO = #{POSTNO},
-			UNIT = #{UNIT},
-			STARTTIME = #{STARTTIME},
-			ENDTIME = #{ENDTIME},
-			<if test="FILEPATH!= null and FILEPATH != ''"><!-- 检索 -->
-				FILEPATH = #{FILEPATH},
-			</if>
-			ISVALID = #{ISVALID},
-			MFOLDER_ID = MFOLDER_ID
-		where
-			MFOLDER_ID = #{MFOLDER_ID}
-	</update>
-
-	<!-- 通过ID获取数据 -->
-	<select id="findById" parameterType="pd" resultType="pd">
-		select
-		<include refid="Field"></include>
-		from
-		<include refid="tableName"></include> f
-		where
-			f.MFOLDER_ID = #{MFOLDER_ID}
-	</select>
-
-	<!-- 列表 -->
-	<select id="datalistPage" parameterType="page" resultType="pd">
-		select
-		<include refid="Field"></include>
-		from
-		<include refid="tableName"></include> f
-		where 1=1
-		<if test="pd.CORPINFO_ID!= null and pd.CORPINFO_ID != ''"><!-- 检索 -->
-			and f.CORPINFO_ID = #{pd.CORPINFO_ID}
-		</if>
-		<if test="pd.MFOLDER_ID!= null and pd.MFOLDER_ID != ''"><!-- 检索 -->
-			and f.PARENT_ID = #{pd.MFOLDER_ID}
-		</if>
-		<if test="pd.KEYWORDS != null and pd.KEYWORDS != ''"><!-- 关键词检索 -->
-			and
-				(
-					f.REMARKS LIKE CONCAT(CONCAT('%', #{pd.KEYWORDS}),'%')
-					 or
-					f.NAME LIKE CONCAT(CONCAT('%', #{pd.KEYWORDS}),'%')
-				)
-		</if>
-		<if test="pd.USERNAME!= null and pd.USERNAME != ''">
-			and f.MASTER = #{pd.USERNAME}
-		</if>
-		<if test="pd.TYPE!= null and pd.TYPE != ''">
-			and f.TYPE = #{pd.TYPE}
-		</if>
-		<if test="pd.isBI!= null and pd.isBI != ''">
-			and f.PARENT_ID != 0
-		</if>
-		<if test="pd.SHARE != null and pd.SHARE == 'yes'">
-			and f.SHARE = 'yes'
-		</if>
-		order by f.CTIME desc
-	</select>
-
-	<!-- 通过ID获取其子级列表 -->
-	<select id="listByParentId" parameterType="pd" resultMap="mfolderResultMap">
-		select
-		<include refid="Field"></include>
-		from
-		<include refid="tableName"></include> f
-		where
-			f.PARENT_ID = #{parentId}
-		<if test="USERNAME != null and USERNAME != ''">
-			and f.MASTER = #{USERNAME}
-		</if>
-		<if test="SHARE != null and SHARE == 'yes'">
-			and f.SHARE = 'yes'
-		</if>
-		<if test="TYPE != NULL and TYPE != ''">
-			and f.TYPE = #{TYPE}
-		</if>
-		order by f.NAME
-	</select>
-
-	<!-- 通过ID获取其子级列表 -->
-	<select id="findByParentId" parameterType="String" resultMap="mfolderResultMap">
-	select
-	<include refid="Field"></include>
-	from
-	<include refid="tableName"></include> f
-	where
-	f.PARENT_ID = #{parentId}
-	and f.SHARE = 'yes'
-	order by f.CTIME desc
-	</select>
-
-	<!-- 通过ID获取其子级列表 -->
-	<select id="findByName" parameterType="pd" resultType="pd">
-		select
-		<include refid="Field"></include>
-		from
-		<include refid="tableName"></include> f
-		where
-		f.NAME LIKE CONCAT(CONCAT('%', #{KEYWORDS}),'%')
-		and f.SHARE = 'yes'
-		order by f.CTIME desc
-	</select>
-
-	<!-- 根据ID组修改数据 -->
-	<update id="makeAll" parameterType="pd">
-		update
-		<include refid="tableName"></include>
-		set
-			SHARE = #{SHARE}
-		where
-			MFOLDER_ID in
-		<foreach item="item" index="index" collection="IDS" open="(" separator="," close=")">
-                 #{item}
-		</foreach>
-	</update>
-
-	<!-- 列表(全部) -->
-	<select id="listAll" parameterType="pd" resultType="pd">
-		select
-		<include refid="Field"></include>
-		from
-		<include refid="tableName"></include> f
-		where 1 =1
-		<if test="CORPINFO_ID != null and CORPINFO_ID != ''"><!-- 检索 -->
-			and (f.CORPINFO_ID = #{CORPINFO_ID} or f.CORPINFO_ID is null or f.CORPINFO_ID = '')
-		</if>
-		<if test="PARENT_ID != null and PARENT_ID != ''"><!-- 检索 -->
-			and f.PARENT_ID = #{PARENT_ID}
-		</if>
-		<if test="TYPE != null and TYPE != ''"><!-- 检索 -->
-			and f.TYPE = #{TYPE}
-		</if>
-	</select>
-
-
-	<!-- fh 31 3 59 67 90 qq(青苔) -->
-</mapper>