Merge remote-tracking branch 'origin/master'

src/main/java/com/jeeplus/modules/sg/financial/project/mapper/xml/ProjectMapper.xml

@@ -30,14 +30,14 @@
 	<select id="get" resultType="Project" >
 		SELECT 
 			<include refid="projectColumns"/>
-		FROM js_project_detail a
+		FROM sm_project_detail a
 		WHERE a.id = #{id}
 	</select>
 	
 	<select id="findList" resultType="Project" >
 		SELECT 
 			<include refid="projectColumns"/>
-		FROM js_project_detail a
+		FROM sm_project_detail a
 		<where>
 			a.del_flag = #{DEL_FLAG_NORMAL}
 			${dataScope}
@@ -58,7 +58,7 @@
 	<select id="findAllList" resultType="Project" >
 		SELECT
 		<include refid="projectColumns"/>
-		FROM js_project_detail a
+		FROM sm_project_detail a
 		<where>
 			a.del_flag = #{DEL_FLAG_NORMAL}
 			${dataScope}
@@ -74,7 +74,7 @@
 	</select>
 	
 	<insert id="insert">
-		INSERT INTO js_project_detail(
+		INSERT INTO sm_project_detail(
 			id,
 			create_by,
 			create_date,
@@ -124,7 +124,7 @@
 	</insert>
 	
 	<update id="update">
-		UPDATE js_project_detail SET
+		UPDATE sm_project_detail SET
 			update_by = #{updateBy.id},
 			update_date = #{updateDate},
 			remarks = #{remarks},
@@ -149,13 +149,13 @@
 	
 	<!--物理删除-->
 	<update id="delete">
-		DELETE FROM js_project_detail
+		DELETE FROM sm_project_detail
 		WHERE id = #{id}
 	</update>
 	
 	<!--逻辑删除-->
 	<update id="deleteByLogic">
-		UPDATE js_project_detail SET
+		UPDATE sm_project_detail SET
 			del_flag = #{DEL_FLAG_DELETE}
 		WHERE id = #{id}
 	</update>
@@ -163,7 +163,7 @@
 	
 	<!-- 根据实体名称和字段名称和字段值获取唯一记录 -->
 	<select id="findUniqueByProperty" resultType="Project" statementType="STATEMENT">
-		select * FROM js_project_detail  where ${id} = '${value}'
+		select * FROM sm_project_detail  where ${id} = '${value}'
 	</select>
 	
 </mapper>