Merge branch 'master' into 4.1

src/main/java/com/gogirl/interfaces/store/career/CareerWorksController.java

@@ -43,10 +43,8 @@ public class CareerWorksController {
             cmd.setTechnicianId(technicianId);
             careerCmdService.submitWorks(cmd);
             return JsonResult.success();
-
         } finally {
             workLock.unlock(technicianId);
-
         }
     }
 

src/main/resources/mapper/store/CareerMapper.xml

@@ -92,6 +92,7 @@
                 where technician_id = #{id}
                )
     </select>
+
     <select id="queryMonthPraisePercent" resultType="java.lang.Double">
         SELECT (SELECT count(id)
                 from order_comment
@@ -105,6 +106,7 @@
                   and finish_time &gt; #{month}
                )
     </select>
+
     <select id="queryWorkTpl" resultType="com.gogirl.domain.product.serve.BaseProduce">
         SELECT t1.*
         from base_produce t1
@@ -114,6 +116,7 @@
             and t1.`name` like concat('%',#{searchKeyWord},'%')
         </if>
         and t2.id is null
+        order by t1.update_time desc
     </select>
 
-</mapper>
\ No newline at end of file
+</mapper>