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

haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/service/notify/impl/PendingTaskServiceImpl.java

@@ -34,7 +34,7 @@ public class PendingTaskServiceImpl implements PendingTaskService {
         tabPendingTask.setUpdateTime(new Date());
         if (pendingTask != null) {
             tabPendingTask.setId(pendingTask.getId());
-            pendingTaskMapper.updateByPrimaryKey(tabPendingTask);
+            pendingTaskMapper.updateByPrimaryKeySelective(tabPendingTask);
         } else {
             tabPendingTask.setCreateTime(new Date());
             pendingTaskMapper.insertSelective(tabPendingTask);