Merge remote-tracking branch 'origin/master'

bonus-modules/bonus-material/src/main/resources/mapper/material/scrap/ScrapApplyDetailsMapper.xml

@@ -212,7 +212,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <if test="backId != null">
             back_id,
         </if>
-        create_time
+        create_time,
+         is_ds
         )
         values (
         <if test="newTaskId != null">
@@ -240,7 +241,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <if test="backId != null">
             #{backId},
         </if>
-        NOW()
+        NOW(),
+                '1'
         )
     </insert>