Commit 083f6f22 authored by dahai's avatar dahai

Merge remote-tracking branch 'origin/dev' into dev

parents c94b3305 78072fd6
...@@ -10,11 +10,11 @@ import java.util.List; ...@@ -10,11 +10,11 @@ import java.util.List;
public interface MaterialManagementMapper { public interface MaterialManagementMapper {
@Insert("<script>" + @Insert("<script>" +
"INSERT INTO PLASTIC_FILM (TOTAL_COUNT,PLASTIC_FILM_TYPE," + "INSERT INTO PLASTIC_FILM (TOTAL_COUNT,PLASTIC_FILM_TYPE," +
"<if test='note !=null>" + "<if test='note !=null'>" +
"NOTE," + "NOTE," +
"</if>" + "</if>" +
"name,state) VALUES(#{totalCount},#{plasticFilmType}," + "name,state) VALUES(#{totalCount},#{plasticFilmType}," +
"<if test='note !=null>" + "<if test='note !=null'>" +
"#{note}," + "#{note}," +
"</if>" + "</if>" +
"#{name},#{state})" + "#{name},#{state})" +
...@@ -57,11 +57,11 @@ public interface MaterialManagementMapper { ...@@ -57,11 +57,11 @@ public interface MaterialManagementMapper {
@Insert("<script>" + @Insert("<script>" +
"INSERT INTO CARD_BODY (CARD_TYPE,TOTAL_COUNT," + "INSERT INTO CARD_BODY (CARD_TYPE,TOTAL_COUNT," +
"<if test='note !=null>" + "<if test='note !=null'>" +
"NOTE," + "NOTE," +
"</if>" + "</if>" +
"name,CARD_BODY_TYPE,state)VALUES(#{cardType},#{totalCount}," + "name,CARD_BODY_TYPE,state)VALUES(#{cardType},#{totalCount}," +
"<if test='note !=null>" + "<if test='note !=null'>" +
"#{note}," + "#{note}," +
"</if>" + "</if>" +
"#{name},#{cardBodyType},#{state})" + "#{name},#{cardBodyType},#{state})" +
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment